From 5d778175ee4598780bb4abfe92075880a392bde9 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 5 Apr 2019 00:33:12 +0100 Subject: [PATCH] testsuite/reftests: Update UI files Run the UI files through `gtk-builder-tool simplify --3to4` to update the layout properties. --- .../reftests/721800-0px-dotted-border.ref.ui | 5 - .../reftests/721800-0px-dotted-border.ui | 5 - testsuite/reftests/actionbar.ref.ui | 19 +- testsuite/reftests/actionbar.ui | 5 +- testsuite/reftests/animation-direction.ref.ui | 388 +- testsuite/reftests/animation-direction.ui | 324 +- ...animation-fill-mode-iteration-count.ref.ui | 644 ++- .../animation-fill-mode-iteration-count.ui | 644 ++- testsuite/reftests/background-area.ref.ui | 70 +- testsuite/reftests/background-area.ui | 55 +- ...kground-blend-mode-clip-interaction.ref.ui | 7 +- .../background-blend-mode-clip-interaction.ui | 7 +- .../background-color-transparent.ref.ui | 40 +- .../reftests/background-color-transparent.ui | 40 +- .../reftests/background-image-multiple.ref.ui | 155 +- .../reftests/background-image-multiple.ui | 89 +- testsuite/reftests/background-origin.ref.ui | 9 +- testsuite/reftests/background-origin.ui | 157 +- .../background-position-repeat.ref.ui | 7 +- .../reftests/background-position-repeat.ui | 7 +- .../background-position-simple.ref.ui | 2 - .../reftests/background-position-simple.ui | 2 - testsuite/reftests/background-position.ref.ui | 125 +- testsuite/reftests/background-position.ui | 159 +- .../background-positioning-area-empty.ref.ui | 6 +- .../background-positioning-area-empty.ui | 6 +- testsuite/reftests/background-repeat.ref.ui | 60 +- testsuite/reftests/background-repeat.ui | 46 +- .../reftests/background-size-keywords.ref.ui | 208 +- .../reftests/background-size-keywords.ui | 208 +- .../reftests/background-size-zero.ref.ui | 2 - testsuite/reftests/background-size-zero.ui | 2 - testsuite/reftests/background-size.ref.ui | 208 +- testsuite/reftests/background-size.ui | 208 +- .../background-window-transparent.ref.ui | 5 +- .../reftests/background-window-transparent.ui | 5 +- testsuite/reftests/bad-color-names.ref.ui | 2 - testsuite/reftests/bad-color-names.ui | 2 - .../reftests/border-color-default.ref.ui | 7 +- testsuite/reftests/border-color-default.ui | 7 +- .../border-corner-zero-width-rendering.ref.ui | 212 +- .../border-corner-zero-width-rendering.ui | 212 +- testsuite/reftests/border-half-pixel.ref.ui | 7 +- testsuite/reftests/border-half-pixel.ui | 7 +- .../reftests/border-image-excess-size.ref.ui | 72 +- .../reftests/border-image-excess-size.ui | 7 +- .../reftests/border-image-url-scaled.ref.ui | 23 +- testsuite/reftests/border-image-url-scaled.ui | 9 +- testsuite/reftests/border-image-url.ref.ui | 9 +- testsuite/reftests/border-image-url.ui | 9 +- testsuite/reftests/border-radius-clamp.ref.ui | 4 - testsuite/reftests/border-radius-clamp.ui | 4 - testsuite/reftests/border-style-none.ref.ui | 9 +- testsuite/reftests/border-style-none.ui | 9 +- testsuite/reftests/border-style.ref.ui | 21 +- testsuite/reftests/border-style.ui | 72 +- testsuite/reftests/box-order.ref.ui | 124 +- testsuite/reftests/box-order.ui | 127 +- testsuite/reftests/box-pseudo-classes.ref.ui | 89 +- testsuite/reftests/box-pseudo-classes.ui | 89 +- .../box-shadow-changes-modify-clip.ref.ui | 4 - .../box-shadow-changes-modify-clip.ui | 6 - .../reftests/box-shadow-spec-inset.ref.ui | 304 +- testsuite/reftests/box-shadow-spec-inset.ui | 112 +- testsuite/reftests/box-shadow-spread.ref.ui | 5 - testsuite/reftests/box-shadow-spread.ui | 5 - .../box-shadow-with-blend-mode.ref.ui | 7 +- .../reftests/box-shadow-with-blend-mode.ui | 7 +- testsuite/reftests/button-wrapping.ref.ui | 25 +- testsuite/reftests/button-wrapping.ui | 25 +- testsuite/reftests/color-transition.ref.ui | 2 - testsuite/reftests/color-transition.ui | 10 +- .../reftests/css-currentcolor-alpha.ref.ui | 2 - testsuite/reftests/css-currentcolor-alpha.ui | 2 - testsuite/reftests/css-em-label-size.ref.ui | 220 +- testsuite/reftests/css-em-label-size.ui | 178 +- .../reftests/css-image-aspect-ratio.ref.ui | 2 - testsuite/reftests/css-image-aspect-ratio.ui | 2 - .../css-image-color-aspect-ratio.ref.ui | 2 - .../reftests/css-image-color-aspect-ratio.ui | 2 - testsuite/reftests/css-match-class.ref.ui | 4 - testsuite/reftests/css-match-class.ui | 4 +- .../css-match-descendant-later.ref.ui | 4 - .../reftests/css-match-descendant-later.ui | 32 +- testsuite/reftests/css-match-exact.ref.ui | 2 - testsuite/reftests/css-match-exact.ui | 18 +- testsuite/reftests/css-match-import.ref.ui | 4 - testsuite/reftests/css-match-import.ui | 4 - .../css-match-inherit-different-state.ref.ui | 11 +- .../css-match-inherit-different-state.ui | 11 +- testsuite/reftests/css-match-inherit.ref.ui | 9 +- testsuite/reftests/css-match-inherit.ui | 9 +- testsuite/reftests/css-match-name.ref.ui | 4 - testsuite/reftests/css-match-name.ui | 4 +- testsuite/reftests/css-match-siblings.ref.ui | 14 - testsuite/reftests/css-match-siblings.ui | 14 - testsuite/reftests/css-match-type.ref.ui | 4 - testsuite/reftests/css-match-type.ui | 4 +- testsuite/reftests/css-multi-state.ref.ui | 13 +- testsuite/reftests/css-multi-state.ui | 13 +- testsuite/reftests/css-rem-label-size.ref.ui | 4 - testsuite/reftests/css-rem-label-size.ui | 4 - testsuite/reftests/expander.ref.ui | 6 +- testsuite/reftests/expander.ui | 7 +- .../reftests/fixed-widget-stacking.ref.ui | 18 +- testsuite/reftests/fixed-widget-stacking.ui | 20 +- testsuite/reftests/flipping-icons.ref.ui | 27 +- testsuite/reftests/flipping-icons.ui | 27 +- testsuite/reftests/font-sizes-names.ref.ui | 30 - testsuite/reftests/font-sizes-names.ui | 30 - .../reftests/grid-empty-with-spacing.ref.ui | 4 - testsuite/reftests/grid-empty-with-spacing.ui | 19 +- testsuite/reftests/grid-expand.ref.ui | 46 +- testsuite/reftests/grid-expand.ui | 64 +- testsuite/reftests/grid-homogeneous.ref.ui | 144 +- testsuite/reftests/grid-homogeneous.ui | 180 +- testsuite/reftests/grid-spacing1.ref.ui | 38 +- testsuite/reftests/grid-spacing1.ui | 98 +- testsuite/reftests/grid-spacing2.ref.ui | 30 +- testsuite/reftests/grid-spacing2.ui | 116 +- testsuite/reftests/grid-spacing3.ref.ui | 60 +- testsuite/reftests/grid-spacing3.ui | 61 +- testsuite/reftests/grid-wfh.ref.ui | 32 +- testsuite/reftests/grid-wfh.ui | 34 +- .../reftests/gtk-icontheme-sizing.ref.ui | 4 - testsuite/reftests/gtk-icontheme-sizing.ui | 4 - .../reftests/gtk-image-effect-inherit.ref.ui | 11 - .../reftests/gtk-image-effect-inherit.ui | 53 +- testsuite/reftests/icon-effect-missing.ref.ui | 10 - testsuite/reftests/icon-effect-missing.ui | 10 - .../reftests/icon-shadow-no-transform.ref.ui | 7 +- .../reftests/icon-shadow-no-transform.ui | 4 - testsuite/reftests/icon-style-basics.ref.ui | 533 +-- testsuite/reftests/icon-style-basics.ui | 533 +-- testsuite/reftests/icon-vfuncs.ref.ui | 104 +- testsuite/reftests/icon-vfuncs.ui | 113 +- testsuite/reftests/iconview-empty.ref.ui | 228 +- testsuite/reftests/iconview-empty.ui | 236 +- .../image-icon-name-use-fallback.ref.ui | 6 +- .../reftests/image-icon-name-use-fallback.ui | 6 +- .../image-icon-shadow-clipping.ref.ui | 4 - .../reftests/image-icon-shadow-clipping.ui | 6 - .../reftests/image-load-from-file.ref.ui | 2 - testsuite/reftests/image-load-from-file.ui | 1 - testsuite/reftests/inherit-and-initial.ref.ui | 133 +- testsuite/reftests/inherit-and-initial.ui | 137 +- .../label-attribute-preference.ref.ui | 18 +- .../reftests/label-attribute-preference.ui | 12 +- testsuite/reftests/label-background.ref.ui | 4 - testsuite/reftests/label-background.ui | 8 - .../reftests/label-box-shadow-clip.ref.ui | 4 - testsuite/reftests/label-box-shadow-clip.ui | 4 - testsuite/reftests/label-clipping.ref.ui | 4 - testsuite/reftests/label-clipping.ui | 6 - .../reftests/label-ellipsize-small.ref.ui | 4 - testsuite/reftests/label-ellipsize-small.ui | 4 - .../reftests/label-ellipsize-with-big.ref.ui | 8 +- .../reftests/label-ellipsize-with-big.ui | 8 +- testsuite/reftests/label-shadows.ref.ui | 132 +- testsuite/reftests/label-shadows.ui | 60 +- testsuite/reftests/label-sizing.ref.ui | 3945 ++++++++--------- testsuite/reftests/label-sizing.ui | 3945 ++++++++--------- .../reftests/label-small-ellipsized.ref.ui | 4 - testsuite/reftests/label-small-ellipsized.ui | 4 - ...bel-text-shadow-changes-modify-clip.ref.ui | 4 - .../label-text-shadow-changes-modify-clip.ui | 6 - .../label-text-shadow-clipping.ref.ui | 4 - .../reftests/label-text-shadow-clipping.ui | 6 - .../label-width-chars-dont-shrink.ref.ui | 10 - .../reftests/label-width-chars-dont-shrink.ui | 10 - testsuite/reftests/label-wrap-justify.ref.ui | 68 +- testsuite/reftests/label-wrap-justify.ui | 74 +- testsuite/reftests/letter-spacing.ref.ui | 4 - testsuite/reftests/letter-spacing.ui | 4 - ...linear-gradient-transition-to-other.ref.ui | 2 - .../linear-gradient-transition-to-other.ui | 2 - testsuite/reftests/linear-gradient.ref.ui | 24 +- testsuite/reftests/linear-gradient.ui | 24 +- testsuite/reftests/link-coloring.ref.ui | 23 +- testsuite/reftests/link-coloring.ui | 24 +- .../messagedialog-secondarytext.ref.ui | 4 +- .../reftests/messagedialog-secondarytext.ui | 5 +- testsuite/reftests/named-colors.ref.ui | 2104 ++++----- testsuite/reftests/named-colors.ui | 2104 ++++----- testsuite/reftests/no-colors.ref.ui | 4 - testsuite/reftests/no-colors.ui | 4 - testsuite/reftests/nonresizable-size.ref.ui | 4 - testsuite/reftests/nonresizable-size.ui | 6 +- .../reftests/notebook-tab-position.ref.ui | 29 +- testsuite/reftests/notebook-tab-position.ui | 29 +- testsuite/reftests/nth-child.ref.ui | 54 - testsuite/reftests/nth-child.ui | 54 - testsuite/reftests/opacity-initial.ref.ui | 2 - testsuite/reftests/opacity-initial.ui | 1 + testsuite/reftests/opacity.ref.ui | 22 +- testsuite/reftests/opacity.ui | 26 +- .../reftests/overlay-no-main-widget.ref.ui | 1 + testsuite/reftests/overlay-no-main-widget.ui | 1 + testsuite/reftests/paned-undersized.ref.ui | 7 +- testsuite/reftests/paned-undersized.ui | 14 +- .../reftests/picture-load-invalid-file.ref.ui | 4 +- .../reftests/picture-load-invalid-file.ui | 1 - testsuite/reftests/pseudoclass-on-box.ref.ui | 15 +- testsuite/reftests/pseudoclass-on-box.ui | 13 +- .../reftests/pseudoclass-on-parent.ref.ui | 13 +- testsuite/reftests/pseudoclass-on-parent.ui | 11 +- testsuite/reftests/quit-mnemonic.ref.ui | 6 +- testsuite/reftests/quit-mnemonic.ui | 34 +- ...eating-radial-gradient-at-beginning.ref.ui | 2 - .../repeating-radial-gradient-at-beginning.ui | 2 - testsuite/reftests/revealer-extra-size.ref.ui | 5 - testsuite/reftests/revealer-extra-size.ui | 9 +- .../revealer-wrappable-contents.ref.ui | 7 +- .../reftests/revealer-wrappable-contents.ui | 11 +- testsuite/reftests/rotated-layout.ref.ui | 32 +- testsuite/reftests/rotated-layout.ui | 32 +- testsuite/reftests/separator-size.ref.ui | 116 +- testsuite/reftests/separator-size.ui | 128 +- .../reftests/set-default-direction.ref.ui | 4 - testsuite/reftests/set-default-direction.ui | 4 - .../reftests/shadow-clip-rounding.ref.ui | 4 - testsuite/reftests/shadow-clip-rounding.ui | 4 - .../reftests/shorthand-entry-border.ref.ui | 5 +- testsuite/reftests/shorthand-entry-border.ui | 5 +- .../reftests/sibling-pseudoclasses.ref.ui | 17 +- testsuite/reftests/sibling-pseudoclasses.ui | 15 +- testsuite/reftests/simple.ref.ui | 4 - testsuite/reftests/simple.ui | 4 - testsuite/reftests/sizegroups-basics.ref.ui | 73 +- testsuite/reftests/sizegroups-basics.ui | 75 +- .../sizegroups-evolution-identity-page.ref.ui | 249 +- .../sizegroups-evolution-identity-page.ui | 254 +- .../sizegroups-get-preferred-null.ref.ui | 23 +- .../reftests/sizegroups-get-preferred-null.ui | 25 +- .../reftests/statusbar-remove-all.ref.ui | 4 - testsuite/reftests/statusbar-remove-all.ui | 4 - .../style-context-save-inheritance.ref.ui | 8 +- .../style-context-save-inheritance.ui | 8 +- .../style-properties-only-child.ref.ui | 7 +- .../reftests/style-properties-only-child.ui | 7 +- .../symbolic-icon-translucent-color.ref.ui | 5 - .../symbolic-icon-translucent-color.ui | 5 - .../reftests/textview-border-windows.ref.ui | 53 +- testsuite/reftests/textview-border-windows.ui | 5 +- testsuite/reftests/textview-margins.ref.ui | 5 +- testsuite/reftests/textview-margins.ui | 5 +- testsuite/reftests/textview-tags.ref.ui | 5 +- testsuite/reftests/textview-tags.ui | 5 +- testsuite/reftests/toplevel-vs-popup.ref.ui | 4 - testsuite/reftests/toplevel-vs-popup.ui | 4 - .../reftests/treeview-crash-too-wide.ref.ui | 43 +- testsuite/reftests/treeview-crash-too-wide.ui | 43 +- .../reftests/treeview-fixed-height.ref.ui | 8 +- testsuite/reftests/treeview-fixed-height.ui | 10 +- .../reftests/treeview-headers-hidden.ref.ui | 8 +- testsuite/reftests/treeview-headers-hidden.ui | 8 +- testsuite/reftests/unresolvable.ref.ui | 2 - testsuite/reftests/unresolvable.ui | 2 - testsuite/reftests/window-border-width.ref.ui | 8 +- testsuite/reftests/window-border-width.ui | 6 +- testsuite/reftests/window-default-size.ref.ui | 2 - testsuite/reftests/window-default-size.ui | 2 - .../reftests/window-height-for-width.ref.ui | 43 +- testsuite/reftests/window-height-for-width.ui | 45 +- .../window-show-contents-on-map.ref.ui | 6 +- .../reftests/window-show-contents-on-map.ui | 5 +- 266 files changed, 10034 insertions(+), 13895 deletions(-) diff --git a/testsuite/reftests/721800-0px-dotted-border.ref.ui b/testsuite/reftests/721800-0px-dotted-border.ref.ui index bcf41a55e8..56115658fe 100644 --- a/testsuite/reftests/721800-0px-dotted-border.ref.ui +++ b/testsuite/reftests/721800-0px-dotted-border.ref.ui @@ -1,14 +1,9 @@ - - - False popup - True - False Hello World diff --git a/testsuite/reftests/721800-0px-dotted-border.ui b/testsuite/reftests/721800-0px-dotted-border.ui index 3165aa4caf..0da0e9de66 100644 --- a/testsuite/reftests/721800-0px-dotted-border.ui +++ b/testsuite/reftests/721800-0px-dotted-border.ui @@ -1,14 +1,9 @@ - - - False popup - True - False Hello World + + 0 + 0 + - - 0 - 0 - - True - False XXX + + 0 + 1 + - - 0 - 1 - - True - False XXX + + 0 + 2 + - - 0 - 2 - - True - False XXX + + 0 + 3 + - - 0 - 3 - - True - False XXX + + 1 + 3 + - - 1 - 3 - - True - False XXX + + 2 + 3 + - - 2 - 3 - - True - False XXX + + 3 + 3 + - - 3 - 3 - - True - False XXX + + 4 + 3 + - - 4 - 3 - - True - False XXX + + 5 + 3 + - - 5 - 3 - - True - False XXX + + 6 + 3 + - - 6 - 3 - - True - False XXX + + 7 + 3 + - - 7 - 3 - - True - False XXX + + 1 + 2 + - - 1 - 2 - - True - False XXX + + 2 + 2 + - - 2 - 2 - - True - False XXX + + 3 + 2 + - - 3 - 2 - - True - False XXX + + 4 + 2 + - - 4 - 2 - - True - False XXX + + 5 + 2 + - - 5 - 2 - - True - False XXX + + 6 + 2 + - - 6 - 2 - - True - False XXX + + 7 + 2 + - - 7 - 2 - - True - False XXX + + 1 + 1 + - - 1 - 1 - - True - False XXX + + 2 + 1 + - - 2 - 1 - - True - False XXX + + 3 + 1 + - - 3 - 1 - - True - False XXX + + 4 + 1 + - - 4 - 1 - - True - False XXX + + 5 + 1 + - - 5 - 1 - - True - False XXX + + 6 + 1 + - - 6 - 1 - - True - False XXX + + 7 + 1 + - - 7 - 1 - - True - False XXX + + 1 + 0 + - - 1 - 0 - - True - False XXX + + 2 + 0 + - - 2 - 0 - - True - False XXX + + 3 + 0 + - - 3 - 0 - - True - False XXX + + 4 + 0 + - - 4 - 0 - - True - False XXX + + 5 + 0 + - - 5 - 0 - - True - False XXX + + 6 + 0 + - - 6 - 0 - - True - False XXX + + 7 + 0 + - - 7 - 0 - diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui index 914e4e8cbc..abc051f883 100644 --- a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui +++ b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui @@ -1,75 +1,59 @@ - - False - True - False - True - False normal + + 0 + 1 + - - 0 - 1 - - True - False reverse + + 0 + 2 + - - 0 - 2 - - True - False alternate + + 0 + 3 + - - 0 - 3 - - True - False alternate-reverse + + 0 + 4 + - - 0 - 4 - - True - False --> 2⅕x + + 12 + 0 + - - 12 - 0 - 50 50 - True - False vertical @@ -77,18 +61,16 @@ + + 12 + 1 + - - 12 - 1 - 50 50 - True - False vertical @@ -96,18 +78,16 @@ + + 12 + 2 + - - 12 - 2 - 50 50 - True - False vertical @@ -115,18 +95,16 @@ + + 12 + 3 + - - 12 - 3 - 50 50 - True - False vertical @@ -134,18 +112,16 @@ + + 12 + 4 + - - 12 - 4 - 50 50 - True - False vertical @@ -153,18 +129,16 @@ + + 11 + 4 + - - 11 - 4 - 50 50 - True - False vertical @@ -172,18 +146,16 @@ + + 11 + 3 + - - 11 - 3 - 50 50 - True - False vertical @@ -191,18 +163,16 @@ + + 11 + 2 + - - 11 - 2 - 50 50 - True - False vertical @@ -210,42 +180,36 @@ + + 11 + 1 + - - 11 - 1 - - True - False <-- 2⅕x + + 11 + 0 + - - 11 - 0 - - True - False --> 2x + + 10 + 0 + - - 10 - 0 - 50 50 - True - False vertical @@ -253,18 +217,16 @@ + + 10 + 1 + - - 10 - 1 - 50 50 - True - False vertical @@ -272,18 +234,16 @@ + + 10 + 2 + - - 10 - 2 - 50 50 - True - False vertical @@ -291,18 +251,16 @@ + + 10 + 3 + - - 10 - 3 - 50 50 - True - False vertical @@ -310,18 +268,16 @@ + + 10 + 4 + - - 10 - 4 - 50 50 - True - False vertical @@ -329,18 +285,16 @@ + + 9 + 4 + - - 9 - 4 - 50 50 - True - False vertical @@ -348,18 +302,16 @@ + + 9 + 3 + - - 9 - 3 - 50 50 - True - False vertical @@ -367,18 +319,16 @@ + + 9 + 2 + - - 9 - 2 - 50 50 - True - False vertical @@ -386,42 +336,36 @@ + + 9 + 1 + - - 9 - 1 - - True - False <-- 2x + + 9 + 0 + - - 9 - 0 - - True - False --> 1⅕x + + 8 + 0 + - - 8 - 0 - 50 50 - True - False vertical @@ -429,18 +373,16 @@ + + 8 + 1 + - - 8 - 1 - 50 50 - True - False vertical @@ -448,18 +390,16 @@ + + 8 + 2 + - - 8 - 2 - 50 50 - True - False vertical @@ -467,18 +407,16 @@ + + 8 + 3 + - - 8 - 3 - 50 50 - True - False vertical @@ -486,30 +424,26 @@ + + 8 + 4 + - - 8 - 4 - - True - False <-- 1⅕x + + 7 + 0 + - - 7 - 0 - 50 50 - True - False vertical @@ -517,18 +451,16 @@ + + 7 + 1 + - - 7 - 1 - 50 50 - True - False vertical @@ -536,18 +468,16 @@ + + 7 + 2 + - - 7 - 2 - 50 50 - True - False vertical @@ -555,18 +485,16 @@ + + 7 + 3 + - - 7 - 3 - 50 50 - True - False vertical @@ -574,30 +502,26 @@ + + 7 + 4 + - - 7 - 4 - - True - False --> 1x + + 6 + 0 + - - 6 - 0 - 50 50 - True - False vertical @@ -605,18 +529,16 @@ + + 6 + 1 + - - 6 - 1 - 50 50 - True - False vertical @@ -624,18 +546,16 @@ + + 6 + 2 + - - 6 - 2 - 50 50 - True - False vertical @@ -643,18 +563,16 @@ + + 6 + 3 + - - 6 - 3 - 50 50 - True - False vertical @@ -662,30 +580,26 @@ + + 6 + 4 + - - 6 - 4 - - True - False <-- 1x + + 5 + 0 + - - 5 - 0 - 50 50 - True - False vertical @@ -693,18 +607,16 @@ + + 5 + 1 + - - 5 - 1 - 50 50 - True - False vertical @@ -712,18 +624,16 @@ + + 5 + 2 + - - 5 - 2 - 50 50 - True - False vertical @@ -731,18 +641,16 @@ + + 5 + 3 + - - 5 - 3 - 50 50 - True - False vertical @@ -750,42 +658,36 @@ + + 5 + 4 + - - 5 - 4 - - True - False <-- ⅕x + + 3 + 0 + - - 3 - 0 - - True - False --> ⅕x + + 4 + 0 + - - 4 - 0 - 50 50 - True - False vertical @@ -793,18 +695,16 @@ + + 3 + 1 + - - 3 - 1 - 50 50 - True - False vertical @@ -812,18 +712,16 @@ + + 4 + 1 + - - 4 - 1 - 50 50 - True - False vertical @@ -831,18 +729,16 @@ + + 3 + 2 + - - 3 - 2 - 50 50 - True - False vertical @@ -850,18 +746,16 @@ + + 4 + 2 + - - 4 - 2 - 50 50 - True - False vertical @@ -869,18 +763,16 @@ + + 3 + 3 + - - 3 - 3 - 50 50 - True - False vertical @@ -888,18 +780,16 @@ + + 3 + 4 + - - 3 - 4 - 50 50 - True - False vertical @@ -907,18 +797,16 @@ + + 4 + 3 + - - 4 - 3 - 50 50 - True - False vertical @@ -926,42 +814,36 @@ + + 4 + 4 + - - 4 - 4 - - True - False <-- 0x + + 1 + 0 + - - 1 - 0 - - True - False --> 0x + + 2 + 0 + - - 2 - 0 - 50 50 - True - False vertical @@ -969,18 +851,16 @@ + + 1 + 1 + - - 1 - 1 - 50 50 - True - False vertical @@ -988,18 +868,16 @@ + + 1 + 2 + - - 1 - 2 - 50 50 - True - False vertical @@ -1007,18 +885,16 @@ + + 1 + 3 + - - 1 - 3 - 50 50 - True - False vertical @@ -1026,18 +902,16 @@ + + 1 + 4 + - - 1 - 4 - 50 50 - True - False vertical @@ -1045,18 +919,16 @@ + + 2 + 4 + - - 2 - 4 - 50 50 - True - False vertical @@ -1064,18 +936,16 @@ + + 2 + 3 + - - 2 - 3 - 50 50 - True - False vertical @@ -1083,18 +953,16 @@ + + 2 + 2 + - - 2 - 2 - 50 50 - True - False vertical @@ -1102,11 +970,11 @@ + + 2 + 1 + - - 2 - 1 - diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ui index cfb64c74fa..4f88c507cb 100644 --- a/testsuite/reftests/animation-fill-mode-iteration-count.ui +++ b/testsuite/reftests/animation-fill-mode-iteration-count.ui @@ -1,75 +1,59 @@ - - False - True - False - True - False normal + + 0 + 1 + - - 0 - 1 - - True - False reverse + + 0 + 2 + - - 0 - 2 - - True - False alternate + + 0 + 3 + - - 0 - 3 - - True - False alternate-reverse + + 0 + 4 + - - 0 - 4 - - True - False --> 2⅕x + + 12 + 0 + - - 12 - 0 - 50 50 - True - False vertical @@ -79,18 +63,16 @@ + + 12 + 1 + - - 12 - 1 - 50 50 - True - False vertical @@ -100,18 +82,16 @@ + + 12 + 2 + - - 12 - 2 - 50 50 - True - False vertical @@ -121,18 +101,16 @@ + + 12 + 3 + - - 12 - 3 - 50 50 - True - False vertical @@ -142,30 +120,26 @@ + + 12 + 4 + - - 12 - 4 - - True - False <-- 2⅕x + + 11 + 0 + - - 11 - 0 - 50 50 - True - False vertical @@ -175,18 +149,16 @@ + + 11 + 1 + - - 11 - 1 - 50 50 - True - False vertical @@ -196,18 +168,16 @@ + + 11 + 2 + - - 11 - 2 - 50 50 - True - False vertical @@ -217,18 +187,16 @@ + + 11 + 3 + - - 11 - 3 - 50 50 - True - False vertical @@ -238,18 +206,16 @@ + + 11 + 4 + - - 11 - 4 - 50 50 - True - False vertical @@ -259,18 +225,16 @@ + + 10 + 4 + - - 10 - 4 - 50 50 - True - False vertical @@ -280,18 +244,16 @@ + + 10 + 3 + - - 10 - 3 - 50 50 - True - False vertical @@ -301,18 +263,16 @@ + + 10 + 2 + - - 10 - 2 - 50 50 - True - False vertical @@ -322,42 +282,36 @@ + + 10 + 1 + - - 10 - 1 - - True - False --> 2x + + 10 + 0 + - - 10 - 0 - - True - False <-- 2x + + 9 + 0 + - - 9 - 0 - 50 50 - True - False vertical @@ -367,18 +321,16 @@ + + 9 + 1 + - - 9 - 1 - 50 50 - True - False vertical @@ -388,18 +340,16 @@ + + 9 + 2 + - - 9 - 2 - 50 50 - True - False vertical @@ -409,18 +359,16 @@ + + 9 + 3 + - - 9 - 3 - 50 50 - True - False vertical @@ -430,30 +378,26 @@ + + 9 + 4 + - - 9 - 4 - - True - False --> 1⅕x + + 8 + 0 + - - 8 - 0 - 50 50 - True - False vertical @@ -463,18 +407,16 @@ + + 8 + 1 + - - 8 - 1 - 50 50 - True - False vertical @@ -484,18 +426,16 @@ + + 8 + 2 + - - 8 - 2 - 50 50 - True - False vertical @@ -505,18 +445,16 @@ + + 8 + 3 + - - 8 - 3 - 50 50 - True - False vertical @@ -526,18 +464,16 @@ + + 8 + 4 + - - 8 - 4 - 50 50 - True - False vertical @@ -547,18 +483,16 @@ + + 7 + 4 + - - 7 - 4 - 50 50 - True - False vertical @@ -568,18 +502,16 @@ + + 7 + 3 + - - 7 - 3 - 50 50 - True - False vertical @@ -589,18 +521,16 @@ + + 7 + 2 + - - 7 - 2 - 50 50 - True - False vertical @@ -610,42 +540,36 @@ + + 7 + 1 + - - 7 - 1 - - True - False <-- 1⅕x + + 7 + 0 + - - 7 - 0 - - True - False --> 1x + + 6 + 0 + - - 6 - 0 - 50 50 - True - False vertical @@ -655,18 +579,16 @@ + + 6 + 1 + - - 6 - 1 - 50 50 - True - False vertical @@ -676,18 +598,16 @@ + + 6 + 2 + - - 6 - 2 - 50 50 - True - False vertical @@ -697,18 +617,16 @@ + + 6 + 3 + - - 6 - 3 - 50 50 - True - False vertical @@ -718,30 +636,26 @@ + + 6 + 4 + - - 6 - 4 - - True - False <-- 1x + + 5 + 0 + - - 5 - 0 - 50 50 - True - False vertical @@ -751,18 +665,16 @@ + + 5 + 1 + - - 5 - 1 - 50 50 - True - False vertical @@ -772,18 +684,16 @@ + + 5 + 2 + - - 5 - 2 - 50 50 - True - False vertical @@ -793,18 +703,16 @@ + + 5 + 3 + - - 5 - 3 - 50 50 - True - False vertical @@ -814,42 +722,36 @@ + + 5 + 4 + - - 5 - 4 - - True - False <-- ⅕x + + 3 + 0 + - - 3 - 0 - - True - False --> ⅕x + + 4 + 0 + - - 4 - 0 - 50 50 - True - False vertical @@ -859,18 +761,16 @@ + + 3 + 1 + - - 3 - 1 - 50 50 - True - False vertical @@ -880,18 +780,16 @@ + + 4 + 1 + - - 4 - 1 - 50 50 - True - False vertical @@ -901,18 +799,16 @@ + + 4 + 2 + - - 4 - 2 - 50 50 - True - False vertical @@ -922,18 +818,16 @@ + + 3 + 2 + - - 3 - 2 - 50 50 - True - False vertical @@ -943,18 +837,16 @@ + + 3 + 3 + - - 3 - 3 - 50 50 - True - False vertical @@ -964,18 +856,16 @@ + + 4 + 3 + - - 4 - 3 - 50 50 - True - False vertical @@ -985,18 +875,16 @@ + + 3 + 4 + - - 3 - 4 - 50 50 - True - False vertical @@ -1006,42 +894,36 @@ + + 4 + 4 + - - 4 - 4 - - True - False <-- 0x + + 1 + 0 + - - 1 - 0 - - True - False --> 0x + + 2 + 0 + - - 2 - 0 - 50 50 - True - False vertical @@ -1051,18 +933,16 @@ + + 1 + 1 + - - 1 - 1 - 50 50 - True - False vertical @@ -1072,18 +952,16 @@ + + 2 + 1 + - - 2 - 1 - 50 50 - True - False vertical @@ -1093,18 +971,16 @@ + + 2 + 2 + - - 2 - 2 - 50 50 - True - False vertical @@ -1114,18 +990,16 @@ + + 2 + 3 + - - 2 - 3 - 50 50 - True - False vertical @@ -1135,18 +1009,16 @@ + + 2 + 4 + - - 2 - 4 - 50 50 - True - False vertical @@ -1156,18 +1028,16 @@ + + 1 + 4 + - - 1 - 4 - 50 50 - True - False vertical @@ -1177,18 +1047,16 @@ + + 1 + 3 + - - 1 - 3 - 50 50 - True - False vertical @@ -1198,11 +1066,11 @@ + + 1 + 2 + - - 1 - 2 - diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui index 4d63083dd0..33789a1040 100644 --- a/testsuite/reftests/background-area.ref.ui +++ b/testsuite/reftests/background-area.ref.ui @@ -1,53 +1,45 @@ - - False popup - True - False vertical 5 - - reference1 - True - True - True - 144 - 70 - - + + reference1 + 1 + 1 + 144 + 70 + + - - reference2 - True - True - True - 144 - 70 - - + + reference2 + 1 + 1 + 144 + 70 + + - - reference3 - True - True - True - 144 - 70 - - - reference3inner - True - True - True - - - - + + reference3 + 1 + 1 + 144 + 70 + + + reference3inner + 1 + 1 + + + + diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui index d9f1303835..f4b96de1d4 100644 --- a/testsuite/reftests/background-area.ui +++ b/testsuite/reftests/background-area.ui @@ -1,45 +1,38 @@ - - False popup - True - False vertical 5 - - button1 - True - True - True - 144 - 70 - - + + button1 + 1 + 1 + 144 + 70 + + - - button2 - True - True - True - 144 - 70 - - + + button2 + 1 + 1 + 144 + 70 + + - - button3 - True - True - True - 144 - 70 - - + + button3 + 1 + 1 + 144 + 70 + + diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui index fdedb423e2..d8e47d84e3 100644 --- a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui +++ b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui @@ -1,17 +1,12 @@ - 50 50 - False popup reference - - True - False - + diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ui index 82d787a57b..8b5af4d54e 100644 --- a/testsuite/reftests/background-blend-mode-clip-interaction.ui +++ b/testsuite/reftests/background-blend-mode-clip-interaction.ui @@ -1,16 +1,11 @@ - 50 50 - False popup - - True - False - + diff --git a/testsuite/reftests/background-color-transparent.ref.ui b/testsuite/reftests/background-color-transparent.ref.ui index 1afe963e45..d76a96e08c 100644 --- a/testsuite/reftests/background-color-transparent.ref.ui +++ b/testsuite/reftests/background-color-transparent.ref.ui @@ -1,42 +1,36 @@ - - False - True - False opaque - True - True - True + 1 + 1 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - transparent - True - True - True + 1 + 1 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/background-color-transparent.ui b/testsuite/reftests/background-color-transparent.ui index f0bcfce9e9..07c53021d5 100644 --- a/testsuite/reftests/background-color-transparent.ui +++ b/testsuite/reftests/background-color-transparent.ui @@ -1,42 +1,36 @@ - - False - True - False opaque - True - True - True + 1 + 1 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - transparent - True - True - True + 1 + 1 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/background-image-multiple.ref.ui b/testsuite/reftests/background-image-multiple.ref.ui index e8218af6b1..079929abf1 100644 --- a/testsuite/reftests/background-image-multiple.ref.ui +++ b/testsuite/reftests/background-image-multiple.ref.ui @@ -1,117 +1,102 @@ - - False popup - True - False vertical 5 - - ref1 - True - True - True - 144 - 70 - - + + ref1 + 1 + 1 + 144 + 70 + + - - ref2 - True - True - True - 144 - 70 - - + + ref2 + 1 + 1 + 144 + 70 + + - - ref3 - True - True - True - 144 - 70 - - + + ref3 + 1 + 1 + 144 + 70 + + - - True - False - 144 - 70 + + 144 + 70 - ref4-bg - True - True - True - 144 - 70 + ref4-bg + 1 + 1 + 144 + 70 + + 0 + 0 + - - 0 - 0 - - ref4-fg - True - True - True - 120 - 46 + ref4-fg + 1 + 1 + 120 + 46 + + 12 + 12 + - - 12 - 12 - - - + + - - True - False - 144 - 70 + + 144 + 70 - ref5-bg - True - True - True - 144 - 70 + ref5-bg + 1 + 1 + 144 + 70 + + 0 + 0 + - - 0 - 0 - - ref5-fg - True - True - True - 120 - 46 + ref5-fg + 1 + 1 + 120 + 46 + + 12 + 12 + - - 12 - 12 - - - + + diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui index 1d212e6136..b30e02f939 100644 --- a/testsuite/reftests/background-image-multiple.ui +++ b/testsuite/reftests/background-image-multiple.ui @@ -1,65 +1,56 @@ - - False popup - True - False vertical 5 - - button1 - True - True - True - 144 - 70 - - + + button1 + 1 + 1 + 144 + 70 + + - - button2 - True - True - True - 144 - 70 - - + + button2 + 1 + 1 + 144 + 70 + + - - button3 - True - True - True - 144 - 70 - - + + button3 + 1 + 1 + 144 + 70 + + - - button4 - True - True - True - 144 - 70 - - + + button4 + 1 + 1 + 144 + 70 + + - - button5 - True - True - True - 144 - 70 - - + + button5 + 1 + 1 + 144 + 70 + + diff --git a/testsuite/reftests/background-origin.ref.ui b/testsuite/reftests/background-origin.ref.ui index 804fd56615..bb9080172a 100644 --- a/testsuite/reftests/background-origin.ref.ui +++ b/testsuite/reftests/background-origin.ref.ui @@ -1,17 +1,14 @@ - - False popup 154 680 - reference - True - True - True + reference + 1 + 1 diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui index ab28b735f2..061c285cb1 100644 --- a/testsuite/reftests/background-origin.ui +++ b/testsuite/reftests/background-origin.ui @@ -1,105 +1,92 @@ - - False popup - True - False vertical 5 - - button1 - True - True - True - 144 - 70 - - + + button1 + 1 + 1 + 144 + 70 + + - - button2 - True - True - True - 144 - 70 - - + + button2 + 1 + 1 + 144 + 70 + + - - button3 - True - True - True - 144 - 70 - - + + button3 + 1 + 1 + 144 + 70 + + - - button4 - True - True - True - 144 - 70 - - + + button4 + 1 + 1 + 144 + 70 + + - - button5 - True - True - True - 144 - 70 - - + + button5 + 1 + 1 + 144 + 70 + + - - button6 - True - True - True - 144 - 70 - - + + button6 + 1 + 1 + 144 + 70 + + - - button7 - True - True - True - 144 - 70 - - + + button7 + 1 + 1 + 144 + 70 + + - - button8 - True - True - True - 144 - 70 - - + + button8 + 1 + 1 + 144 + 70 + + - - button9 - True - True - True - 144 - 70 - - + + button9 + 1 + 1 + 144 + 70 + + diff --git a/testsuite/reftests/background-position-repeat.ref.ui b/testsuite/reftests/background-position-repeat.ref.ui index 5a25d1be7c..399e9b34a4 100644 --- a/testsuite/reftests/background-position-repeat.ref.ui +++ b/testsuite/reftests/background-position-repeat.ref.ui @@ -1,17 +1,14 @@ - - False popup button1_ref 40 41 - True - True - True + 1 + 1 diff --git a/testsuite/reftests/background-position-repeat.ui b/testsuite/reftests/background-position-repeat.ui index 057db36567..28c855bcba 100644 --- a/testsuite/reftests/background-position-repeat.ui +++ b/testsuite/reftests/background-position-repeat.ui @@ -1,17 +1,14 @@ - - False popup button1 40 41 - True - True - True + 1 + 1 diff --git a/testsuite/reftests/background-position-simple.ref.ui b/testsuite/reftests/background-position-simple.ref.ui index a3367df249..73a6a91297 100644 --- a/testsuite/reftests/background-position-simple.ref.ui +++ b/testsuite/reftests/background-position-simple.ref.ui @@ -1,11 +1,9 @@ - reference 40 40 - False popup diff --git a/testsuite/reftests/background-position-simple.ui b/testsuite/reftests/background-position-simple.ui index 27849e15e4..a15b766c8b 100644 --- a/testsuite/reftests/background-position-simple.ui +++ b/testsuite/reftests/background-position-simple.ui @@ -1,10 +1,8 @@ - 40 40 - False popup diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui index abbbec1aaa..627a16f656 100644 --- a/testsuite/reftests/background-position.ref.ui +++ b/testsuite/reftests/background-position.ref.ui @@ -1,141 +1,128 @@ - - False popup ref - True - False - 120 - 120 + 120 + 120 20 20 - True - True - True + 1 + 1 ref + + 10 + 10 + - - 10 - 10 - 20 20 - True - True - True + 1 + 1 ref + + 40 + 10 + - - 40 - 10 - 20 20 - True - True - True + 1 + 1 ref + + 80 + 20 + - - 80 - 20 - 20 20 - True - True - True + 1 + 1 ref + + 20 + 60 + - - 20 - 60 - 20 20 - True - True - True + 1 + 1 ref + + 60 + 40 + - - 60 - 40 - 20 20 - True - True - True + 1 + 1 ref + + 100 + 50 + - - 100 - 50 - 20 20 - True - True - True + 1 + 1 ref + + 10 + 90 + - - 10 - 90 - 10 20 - True - True - True + 1 + 1 ref + + 40 + 90 + - - 40 - 90 - 20 20 - True - True - True + 1 + 1 ref + + 100 + 100 + - - 100 - 100 - diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui index 94e088e1a1..cfa5cb1c59 100644 --- a/testsuite/reftests/background-position.ui +++ b/testsuite/reftests/background-position.ui @@ -1,158 +1,143 @@ - - False popup - True - False - 0 - 0 40 40 - True - True - True + 1 + 1 a + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - 40 40 - True - True - True + 1 + 1 b + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - 40 40 - True - True - True + 1 + 1 c + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - 40 40 - True - True - True + 1 + 1 d + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - 40 40 - True - True - True + 1 + 1 e + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - 40 40 - True - True - True + 1 + 1 f + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - 40 40 - True - True - True + 1 + 1 g + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - 40 40 - True - True - True + 1 + 1 h + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - 40 40 - True - True - True + 1 + 1 i + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - diff --git a/testsuite/reftests/background-positioning-area-empty.ref.ui b/testsuite/reftests/background-positioning-area-empty.ref.ui index 7e5c85572e..2367e407d9 100644 --- a/testsuite/reftests/background-positioning-area-empty.ref.ui +++ b/testsuite/reftests/background-positioning-area-empty.ref.ui @@ -1,14 +1,10 @@ - - False popup - True - False - True + 1 diff --git a/testsuite/reftests/background-positioning-area-empty.ui b/testsuite/reftests/background-positioning-area-empty.ui index 7e5c85572e..2367e407d9 100644 --- a/testsuite/reftests/background-positioning-area-empty.ui +++ b/testsuite/reftests/background-positioning-area-empty.ui @@ -1,14 +1,10 @@ - - False popup - True - False - True + 1 diff --git a/testsuite/reftests/background-repeat.ref.ui b/testsuite/reftests/background-repeat.ref.ui index f719da0ce5..e0bedecf05 100644 --- a/testsuite/reftests/background-repeat.ref.ui +++ b/testsuite/reftests/background-repeat.ref.ui @@ -1,77 +1,65 @@ - 50 60 - False popup - True - False 50 60 - True - False border-image-ball-red.png + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - 20 60 - True - False border-image-3-balls-green.png + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - 20 60 - True - False border-image-3-balls-green.png + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - default-ref 50 60 - True - False + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - diff --git a/testsuite/reftests/background-repeat.ui b/testsuite/reftests/background-repeat.ui index 8630182ff1..dffc4645bd 100644 --- a/testsuite/reftests/background-repeat.ui +++ b/testsuite/reftests/background-repeat.ui @@ -1,68 +1,58 @@ - 50 60 - False popup - True - False no-repeat 50 60 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - repeat 40 60 - True - False + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - default 50 60 - True - False + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - diff --git a/testsuite/reftests/background-size-keywords.ref.ui b/testsuite/reftests/background-size-keywords.ref.ui index 20294b38a4..397398434e 100644 --- a/testsuite/reftests/background-size-keywords.ref.ui +++ b/testsuite/reftests/background-size-keywords.ref.ui @@ -1,217 +1,201 @@ - - False popup - True - False reference A 40 30 - True - True - True + 1 + 1 a + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - B 40 30 - True - True - True + 1 + 1 b + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - C 40 30 - True - True - True + 1 + 1 c + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - D 40 30 - True - True - True + 1 + 1 d + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - E 40 30 - True - True - True + 1 + 1 e + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - F 40 30 - True - True - True + 1 + 1 f + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - G 40 30 - True - True - True + 1 + 1 g + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - H 40 30 - True - True - True + 1 + 1 h + + 3 + 1 + 1 + 1 + - - 3 - 1 - 1 - 1 - I 40 30 - True - True - True + 1 + 1 i + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - J 40 30 - True - True - True + 1 + 1 j + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - K 40 30 - True - True - True + 1 + 1 k + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - L 40 30 - True - True - True + 1 + 1 l + + 3 + 2 + 1 + 1 + - - 3 - 2 - 1 - 1 - diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui index 71c48676cd..d6acd4e05e 100644 --- a/testsuite/reftests/background-size-keywords.ui +++ b/testsuite/reftests/background-size-keywords.ui @@ -1,216 +1,200 @@ - - False popup - True - False A 40 30 - True - True - True + 1 + 1 a + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - B 40 30 - True - True - True + 1 + 1 b + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - C 40 30 - True - True - True + 1 + 1 c + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - D 40 30 - True - True - True + 1 + 1 d + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - E 40 30 - True - True - True + 1 + 1 e + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - F 40 30 - True - True - True + 1 + 1 f + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - G 40 30 - True - True - True + 1 + 1 g + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - H 40 30 - True - True - True + 1 + 1 h + + 3 + 1 + 1 + 1 + - - 3 - 1 - 1 - 1 - I 40 30 - True - True - True + 1 + 1 i + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - J 40 30 - True - True - True + 1 + 1 j + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - K 40 30 - True - True - True + 1 + 1 k + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - L 40 30 - True - True - True + 1 + 1 l + + 3 + 2 + 1 + 1 + - - 3 - 2 - 1 - 1 - diff --git a/testsuite/reftests/background-size-zero.ref.ui b/testsuite/reftests/background-size-zero.ref.ui index 9d475c3aaa..5cb0e82ca6 100644 --- a/testsuite/reftests/background-size-zero.ref.ui +++ b/testsuite/reftests/background-size-zero.ref.ui @@ -1,8 +1,6 @@ - - False popup reference diff --git a/testsuite/reftests/background-size-zero.ui b/testsuite/reftests/background-size-zero.ui index 51595c7894..ec70764dc3 100644 --- a/testsuite/reftests/background-size-zero.ui +++ b/testsuite/reftests/background-size-zero.ui @@ -1,8 +1,6 @@ - - False popup diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui index 2a2374a159..3fe2e2f29e 100644 --- a/testsuite/reftests/background-size.ref.ui +++ b/testsuite/reftests/background-size.ref.ui @@ -1,217 +1,201 @@ - - False popup - True - False reference A 40 40 - True - True - True + 1 + 1 a + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - B 40 40 - True - True - True + 1 + 1 b + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - C 40 40 - True - True - True + 1 + 1 c + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - D 40 40 - True - True - True + 1 + 1 d + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - E 40 40 - True - True - True + 1 + 1 e + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - F 40 40 - True - True - True + 1 + 1 f + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - G 40 40 - True - True - True + 1 + 1 g + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - H 40 40 - True - True - True + 1 + 1 h + + 3 + 1 + 1 + 1 + - - 3 - 1 - 1 - 1 - I 40 40 - True - True - True + 1 + 1 i + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - J 40 40 - True - True - True + 1 + 1 j + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - K 40 40 - True - True - True + 1 + 1 k + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - L 40 40 - True - True - True + 1 + 1 l + + 3 + 2 + 1 + 1 + - - 3 - 2 - 1 - 1 - diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui index 1de1219972..5fd91c028c 100644 --- a/testsuite/reftests/background-size.ui +++ b/testsuite/reftests/background-size.ui @@ -1,216 +1,200 @@ - - False popup - True - False A 40 40 - True - True - True + 1 + 1 a + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - B 40 40 - True - True - True + 1 + 1 b + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - C 40 40 - True - True - True + 1 + 1 c + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - D 40 40 - True - True - True + 1 + 1 d + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - E 40 40 - True - True - True + 1 + 1 e + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - F 40 40 - True - True - True + 1 + 1 f + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - G 40 40 - True - True - True + 1 + 1 g + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - H 40 40 - True - True - True + 1 + 1 h + + 3 + 1 + 1 + 1 + - - 3 - 1 - 1 - 1 - I 40 40 - True - True - True + 1 + 1 i + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - J 40 40 - True - True - True + 1 + 1 j + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - K 40 40 - True - True - True + 1 + 1 k + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - L 40 40 - True - True - True + 1 + 1 l + + 3 + 2 + 1 + 1 + - - 3 - 2 - 1 - 1 - diff --git a/testsuite/reftests/background-window-transparent.ref.ui b/testsuite/reftests/background-window-transparent.ref.ui index 368cd75cb5..62011eb05c 100644 --- a/testsuite/reftests/background-window-transparent.ref.ui +++ b/testsuite/reftests/background-window-transparent.ref.ui @@ -1,14 +1,11 @@ - - False popup reference - True - True + 1 diff --git a/testsuite/reftests/background-window-transparent.ui b/testsuite/reftests/background-window-transparent.ui index be902b7bdb..9b4f1d07ed 100644 --- a/testsuite/reftests/background-window-transparent.ui +++ b/testsuite/reftests/background-window-transparent.ui @@ -1,13 +1,10 @@ - - False popup - True - True + 1 diff --git a/testsuite/reftests/bad-color-names.ref.ui b/testsuite/reftests/bad-color-names.ref.ui index 5cb9f67be1..297844bb36 100644 --- a/testsuite/reftests/bad-color-names.ref.ui +++ b/testsuite/reftests/bad-color-names.ref.ui @@ -1,10 +1,8 @@ - 10 10 - False popup diff --git a/testsuite/reftests/bad-color-names.ui b/testsuite/reftests/bad-color-names.ui index 5cb9f67be1..297844bb36 100644 --- a/testsuite/reftests/bad-color-names.ui +++ b/testsuite/reftests/bad-color-names.ui @@ -1,10 +1,8 @@ - 10 10 - False popup diff --git a/testsuite/reftests/border-color-default.ref.ui b/testsuite/reftests/border-color-default.ref.ui index c6aa81d1ce..c4e75901a2 100644 --- a/testsuite/reftests/border-color-default.ref.ui +++ b/testsuite/reftests/border-color-default.ref.ui @@ -1,15 +1,12 @@ - - False popup reference - True - True - True + 1 + 1 diff --git a/testsuite/reftests/border-color-default.ui b/testsuite/reftests/border-color-default.ui index 248cd28c0b..5171539c74 100644 --- a/testsuite/reftests/border-color-default.ui +++ b/testsuite/reftests/border-color-default.ui @@ -1,14 +1,11 @@ - - False popup - True - True - True + 1 + 1 diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui index 16ccad538e..df0ac760ae 100644 --- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui +++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui @@ -1,205 +1,185 @@ - - False popup - True - False button - True - True - True + 1 + 1 + + 0 + 0 + - - 0 - 0 - button - True - True - True + 1 + 1 + + 0 + 1 + - - 0 - 1 - button - True - True - True + 1 + 1 + + 0 + 3 + - - 0 - 3 - button - True - True - True + 1 + 1 + + 0 + 2 + - - 0 - 2 - button - True - True - True + 1 + 1 + + 3 + 0 + - - 3 - 0 - button - True - True - True + 1 + 1 + + 2 + 0 + - - 2 - 0 - button - True - True - True + 1 + 1 + + 1 + 0 + - - 1 - 0 - button - True - True - True + 1 + 1 + + 3 + 3 + - - 3 - 3 - button - True - True - True + 1 + 1 + + 3 + 2 + - - 3 - 2 - button - True - True - True + 1 + 1 + + 3 + 1 + - - 3 - 1 - button - True - True - True + 1 + 1 + + 2 + 3 + - - 2 - 3 - button - True - True - True + 1 + 1 + + 1 + 3 + - - 1 - 3 - button - True - True - True + 1 + 1 + + 2 + 2 + - - 2 - 2 - button - True - True - True + 1 + 1 + + 2 + 1 + - - 2 - 1 - button - True - True - True + 1 + 1 + + 1 + 2 + - - 1 - 2 - button - True - True - True + 1 + 1 + + 1 + 1 + - - 1 - 1 - diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui b/testsuite/reftests/border-corner-zero-width-rendering.ui index e413029cfe..51f3df159a 100644 --- a/testsuite/reftests/border-corner-zero-width-rendering.ui +++ b/testsuite/reftests/border-corner-zero-width-rendering.ui @@ -1,267 +1,247 @@ - - False popup - True - False button - True - True - True + 1 + 1 + + 0 + 0 + - - 0 - 0 - button - True - True - True + 1 + 1 + + 0 + 1 + - - 0 - 1 - button - True - True - True + 1 + 1 + + 0 + 3 + - - 0 - 3 - button - True - True - True + 1 + 1 + + 0 + 2 + - - 0 - 2 - button - True - True - True + 1 + 1 + + 3 + 0 + - - 3 - 0 - button - True - True - True + 1 + 1 + + 2 + 0 + - - 2 - 0 - button - True - True - True + 1 + 1 + + 1 + 0 + - - 1 - 0 - button - True - True - True + 1 + 1 + + 3 + 3 + - - 3 - 3 - button - True - True - True + 1 + 1 + + 3 + 2 + - - 3 - 2 - button - True - True - True + 1 + 1 + + 3 + 1 + - - 3 - 1 - button - True - True - True + 1 + 1 + + 2 + 3 + - - 2 - 3 - button - True - True - True + 1 + 1 + + 1 + 3 + - - 1 - 3 - button - True - True - True + 1 + 1 + + 2 + 2 + - - 2 - 2 - button - True - True - True + 1 + 1 + + 2 + 1 + - - 2 - 1 - button - True - True - True + 1 + 1 + + 1 + 2 + - - 1 - 2 - button - True - True - True + 1 + 1 + + 1 + 1 + - - 1 - 1 - diff --git a/testsuite/reftests/border-half-pixel.ref.ui b/testsuite/reftests/border-half-pixel.ref.ui index c6aa81d1ce..c4e75901a2 100644 --- a/testsuite/reftests/border-half-pixel.ref.ui +++ b/testsuite/reftests/border-half-pixel.ref.ui @@ -1,15 +1,12 @@ - - False popup reference - True - True - True + 1 + 1 diff --git a/testsuite/reftests/border-half-pixel.ui b/testsuite/reftests/border-half-pixel.ui index 248cd28c0b..5171539c74 100644 --- a/testsuite/reftests/border-half-pixel.ui +++ b/testsuite/reftests/border-half-pixel.ui @@ -1,14 +1,11 @@ - - False popup - True - True - True + 1 + 1 diff --git a/testsuite/reftests/border-image-excess-size.ref.ui b/testsuite/reftests/border-image-excess-size.ref.ui index 488d6976d1..9da0c1204d 100644 --- a/testsuite/reftests/border-image-excess-size.ref.ui +++ b/testsuite/reftests/border-image-excess-size.ref.ui @@ -1,74 +1,66 @@ - - False popup - True - False 8 8 1 1 - True - True - False + 1 + 0 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - 1 1 - True - True - False + 1 + 0 + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - 1 1 - True - True - False + 1 + 0 + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - 1 1 - True - True - False + 1 + 0 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/border-image-excess-size.ui b/testsuite/reftests/border-image-excess-size.ui index 43bbfc7c52..f4a5021f48 100644 --- a/testsuite/reftests/border-image-excess-size.ui +++ b/testsuite/reftests/border-image-excess-size.ui @@ -1,16 +1,13 @@ - - False popup 10 10 - True - True - False + 1 + 0 diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui b/testsuite/reftests/border-image-url-scaled.ref.ui index 959d3fd398..3509cbc830 100644 --- a/testsuite/reftests/border-image-url-scaled.ref.ui +++ b/testsuite/reftests/border-image-url-scaled.ref.ui @@ -1,26 +1,22 @@ - - False popup reference - True - True - True - True + 1 + 1 + 1 reference - True - True - True - True + 1 + 1 + 1 @@ -28,10 +24,9 @@ reference Hello World - True - True - True - True + 1 + 1 + 1 diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui index 483f5031b4..4542d594c8 100644 --- a/testsuite/reftests/border-image-url-scaled.ui +++ b/testsuite/reftests/border-image-url-scaled.ui @@ -1,17 +1,14 @@ - - False popup reference Hello World - True - True - True - True + 1 + 1 + 1 diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui index e039ffcbd5..b1464c4ac7 100644 --- a/testsuite/reftests/border-image-url.ref.ui +++ b/testsuite/reftests/border-image-url.ref.ui @@ -1,17 +1,14 @@ - - False popup reference Hello World - True - True - True - True + 1 + 1 + 1 diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui index 483f5031b4..4542d594c8 100644 --- a/testsuite/reftests/border-image-url.ui +++ b/testsuite/reftests/border-image-url.ui @@ -1,17 +1,14 @@ - - False popup reference Hello World - True - True - True - True + 1 + 1 + 1 diff --git a/testsuite/reftests/border-radius-clamp.ref.ui b/testsuite/reftests/border-radius-clamp.ref.ui index c38df4f943..1f3fbc4282 100644 --- a/testsuite/reftests/border-radius-clamp.ref.ui +++ b/testsuite/reftests/border-radius-clamp.ref.ui @@ -1,16 +1,12 @@ - - False reference popup 150 20 - True - False 0.5 diff --git a/testsuite/reftests/border-radius-clamp.ui b/testsuite/reftests/border-radius-clamp.ui index 1617d3fa66..481c5508c2 100644 --- a/testsuite/reftests/border-radius-clamp.ui +++ b/testsuite/reftests/border-radius-clamp.ui @@ -1,15 +1,11 @@ - - False popup 150 20 - True - False 0.5 diff --git a/testsuite/reftests/border-style-none.ref.ui b/testsuite/reftests/border-style-none.ref.ui index 9dc4de78f1..ca4bfdeabd 100644 --- a/testsuite/reftests/border-style-none.ref.ui +++ b/testsuite/reftests/border-style-none.ref.ui @@ -1,16 +1,13 @@ - - False popup reference - True - True - True - 144 + 1 + 1 + 144 144 diff --git a/testsuite/reftests/border-style-none.ui b/testsuite/reftests/border-style-none.ui index 58c2416bf9..fc9d598981 100644 --- a/testsuite/reftests/border-style-none.ui +++ b/testsuite/reftests/border-style-none.ui @@ -1,15 +1,12 @@ - - False popup - True - True - True - 144 + 1 + 1 + 144 144 diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui index c4e87381f2..88556a8377 100644 --- a/testsuite/reftests/border-style.ref.ui +++ b/testsuite/reftests/border-style.ref.ui @@ -1,30 +1,25 @@ - - False popup - True - False - True - True - True + 1 + 1 40 40 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - diff --git a/testsuite/reftests/border-style.ui b/testsuite/reftests/border-style.ui index 46e408b182..e3c08e17a9 100644 --- a/testsuite/reftests/border-style.ui +++ b/testsuite/reftests/border-style.ui @@ -1,84 +1,76 @@ - - False popup - True - False - True - True - True + 1 + 1 20 20 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - True - True + 1 + 1 20 20 + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - True - True + 1 + 1 20 20 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - True - True + 1 + 1 20 20 + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui index 103fb57f03..7b539bfb85 100644 --- a/testsuite/reftests/box-order.ref.ui +++ b/testsuite/reftests/box-order.ref.ui @@ -1,308 +1,224 @@ - - False popup - True - False - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 0 + - - 0 - 0 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 1 + - - 0 - 1 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 2 + - - 0 - 2 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 3 + - - 0 - 3 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 4 + - - 0 - 4 - diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui index 679d3185de..8bf2687da7 100644 --- a/testsuite/reftests/box-order.ui +++ b/testsuite/reftests/box-order.ui @@ -1,331 +1,244 @@ - - False popup - True - False - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 0 + - - 0 - 0 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 1 + - - 0 - 1 - - True - False - True - False X X X - False X X X - True - False X X X - False X X X - True - False X X X - False X X X - True - False X X X - False X X X - True - False X X X - False X X X - True - False X X X + + 0 + 2 + - - 0 - 2 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 3 + - - 0 - 3 - - True - False - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X - True - False X X X + + 0 + 4 + - - 0 - 4 - diff --git a/testsuite/reftests/box-pseudo-classes.ref.ui b/testsuite/reftests/box-pseudo-classes.ref.ui index fd6986ecc7..acb21faa98 100644 --- a/testsuite/reftests/box-pseudo-classes.ref.ui +++ b/testsuite/reftests/box-pseudo-classes.ref.ui @@ -1,60 +1,49 @@ - - False popup - True - False - True - False vertical button - True - True - True + 1 + 1 purple button - True - True - True + 1 + 1 yellow button - True - True - True + 1 + 1 red button - True - True - True + 1 + 1 yellow button - True - True - True + 1 + 1 purple @@ -62,42 +51,36 @@ - True - False vertical button - True - True - True + 1 + 1 purple button - True - True - True + 1 + 1 yellow button - True - True - True + 1 + 1 red button - True - True - True + 1 + 1 green @@ -105,33 +88,28 @@ - True - False vertical button - True - True - True + 1 + 1 purple button - True - True - True + 1 + 1 yellow button - True - True - True + 1 + 1 purple @@ -139,24 +117,20 @@ - True - False vertical button - True - True - True + 1 + 1 purple button - True - True - True + 1 + 1 green @@ -164,15 +138,12 @@ - True - False vertical button - True - True - True + 1 + 1 blue diff --git a/testsuite/reftests/box-pseudo-classes.ui b/testsuite/reftests/box-pseudo-classes.ui index 3b34d7596c..f458da2795 100644 --- a/testsuite/reftests/box-pseudo-classes.ui +++ b/testsuite/reftests/box-pseudo-classes.ui @@ -1,164 +1,135 @@ - - False popup - True - False - True - False vertical button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 - True - False vertical button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 - True - False vertical button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 - True - False vertical button - True - True - True + 1 + 1 button - True - True - True + 1 + 1 - True - False vertical button - True - True - True + 1 + 1 diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui index 42a62bc250..c18d74d7e6 100644 --- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui +++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui @@ -1,16 +1,12 @@ - 500 100 - False popup - True - False center center Hello World diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ui index bb34bb001e..f69a690560 100644 --- a/testsuite/reftests/box-shadow-changes-modify-clip.ui +++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui @@ -1,24 +1,18 @@ - 500 100 - False popup - True - False center center vertical - True - False Hello World diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui index 5b67f2981e..9441593c48 100644 --- a/testsuite/reftests/box-shadow-spec-inset.ref.ui +++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui @@ -1,328 +1,284 @@ - - False popup - True - False 20 20 144 144 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - 144 144 - True - False + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False 144 144 - True - False + + 0 + 0 + - - 0 - 0 - 134 134 - True - False + + 5 + 5 + - - 5 - 5 - 119 119 - True - False + + 20 + 20 + - - 20 - 20 - 144 144 - True - False + + 0 + 0 + - - 0 - 0 - + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - False 144 144 - True - False + + 0 + 0 + - - 0 - 0 - 134 134 - True - False + + 5 + 5 + - - 5 - 5 - 119 119 - True - False + + 20 + 20 + - - 20 - 20 - + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - - True - False 144 144 - True - False + + 0 + 0 + - - 0 - 0 - 134 134 - True - False + + 5 + 5 + - - 5 - 5 - 109 109 - True - False + + 30 + 30 + - - 30 - 30 - 144 144 - True - False + + 0 + 0 + - - 0 - 0 - + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - False 144 144 - True - False + + 0 + 0 + - - 0 - 0 - 134 134 - True - False + + 5 + 5 + - - 5 - 5 - 109 109 - True - False + + 30 + 30 + - - 30 - 30 - + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - diff --git a/testsuite/reftests/box-shadow-spec-inset.ui b/testsuite/reftests/box-shadow-spec-inset.ui index 87eedde40a..3d38e4d42d 100644 --- a/testsuite/reftests/box-shadow-spec-inset.ui +++ b/testsuite/reftests/box-shadow-spec-inset.ui @@ -1,122 +1,106 @@ - - False popup - True - False 20 20 144 144 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - 144 144 - True - False + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - 144 144 - True - False + + 1 + 3 + 1 + 1 + - - 1 - 3 - 1 - 1 - 144 144 - True - False + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - 144 144 - True - False + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - 144 144 - True - False + + 2 + 3 + 1 + 1 + - - 2 - 3 - 1 - 1 - diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui index f6894c2b34..826a0dde37 100644 --- a/testsuite/reftests/box-shadow-spread.ref.ui +++ b/testsuite/reftests/box-shadow-spread.ref.ui @@ -1,18 +1,13 @@ - 100 100 - False popup Hi - True - False - False center center + + 1 + 0 + - - 1 - 0 - - True - False - True - False ███ - True - False ███ + + 1 + 1 + - - 1 - 1 - - True - False - True - False ███ - True - False ███ + + 1 + 2 + - - 1 - 2 - - True - False - True - False ███ - True - False ███ + + 1 + 3 + - - 1 - 3 - - True - False - True - False ███ - True - False ███ + + 1 + 4 + - - 1 - 4 - - True - False - True - False ███ - True - False ███ + + 1 + 5 + - - 1 - 5 - - True - False - True - False ███ - True - False ███ + + 1 + 6 + - - 1 - 6 - diff --git a/testsuite/reftests/css-image-aspect-ratio.ref.ui b/testsuite/reftests/css-image-aspect-ratio.ref.ui index 88fbd72e75..8198b04612 100644 --- a/testsuite/reftests/css-image-aspect-ratio.ref.ui +++ b/testsuite/reftests/css-image-aspect-ratio.ref.ui @@ -1,10 +1,8 @@ - 48 24 - False popup reference diff --git a/testsuite/reftests/css-image-aspect-ratio.ui b/testsuite/reftests/css-image-aspect-ratio.ui index c7f559893b..f9a37b7a61 100644 --- a/testsuite/reftests/css-image-aspect-ratio.ui +++ b/testsuite/reftests/css-image-aspect-ratio.ui @@ -1,10 +1,8 @@ - 48 24 - False popup diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui index 982e3d8f8d..5e2a51192a 100644 --- a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui +++ b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui @@ -1,10 +1,8 @@ - 20 10 - False popup reference diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ui b/testsuite/reftests/css-image-color-aspect-ratio.ui index d26485622a..63e8f04846 100644 --- a/testsuite/reftests/css-image-color-aspect-ratio.ui +++ b/testsuite/reftests/css-image-color-aspect-ratio.ui @@ -1,10 +1,8 @@ - 20 10 - False popup diff --git a/testsuite/reftests/css-match-class.ref.ui b/testsuite/reftests/css-match-class.ref.ui index 65fe67e5f1..e85bbec582 100644 --- a/testsuite/reftests/css-match-class.ref.ui +++ b/testsuite/reftests/css-match-class.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False green-20x20.png diff --git a/testsuite/reftests/css-match-class.ui b/testsuite/reftests/css-match-class.ui index ee6db3afc7..ab783b3219 100644 --- a/testsuite/reftests/css-match-class.ui +++ b/testsuite/reftests/css-match-class.ui @@ -1,14 +1,12 @@ - 20 20 - False popup window diff --git a/testsuite/reftests/css-match-descendant-later.ref.ui b/testsuite/reftests/css-match-descendant-later.ref.ui index a6a57bedbe..0c8a4b46e0 100644 --- a/testsuite/reftests/css-match-descendant-later.ref.ui +++ b/testsuite/reftests/css-match-descendant-later.ref.ui @@ -1,15 +1,11 @@ - - False popup 10 10 - True - False diff --git a/testsuite/reftests/css-match-descendant-later.ui b/testsuite/reftests/css-match-descendant-later.ui index 97d81708c4..90e3d7a3de 100644 --- a/testsuite/reftests/css-match-descendant-later.ui +++ b/testsuite/reftests/css-match-descendant-later.ui @@ -1,41 +1,33 @@ - - False popup - True - False - True - False 10 10 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - diff --git a/testsuite/reftests/css-match-exact.ref.ui b/testsuite/reftests/css-match-exact.ref.ui index 2f24fa197b..74b65db8a1 100644 --- a/testsuite/reftests/css-match-exact.ref.ui +++ b/testsuite/reftests/css-match-exact.ref.ui @@ -1,10 +1,8 @@ - 10 10 - False popup diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui index ce2f815a36..7a9389c2d5 100644 --- a/testsuite/reftests/css-match-exact.ui +++ b/testsuite/reftests/css-match-exact.ui @@ -1,28 +1,22 @@ - 10 10 - False popup - True - False 10 10 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - diff --git a/testsuite/reftests/css-match-import.ref.ui b/testsuite/reftests/css-match-import.ref.ui index 03877e3bf3..a2f55c86fd 100644 --- a/testsuite/reftests/css-match-import.ref.ui +++ b/testsuite/reftests/css-match-import.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False purple Purple diff --git a/testsuite/reftests/css-match-import.ui b/testsuite/reftests/css-match-import.ui index 3a8f869e3b..8ea0858c14 100644 --- a/testsuite/reftests/css-match-import.ui +++ b/testsuite/reftests/css-match-import.ui @@ -1,13 +1,9 @@ - - False popup - True - False Purple diff --git a/testsuite/reftests/css-match-inherit-different-state.ref.ui b/testsuite/reftests/css-match-inherit-different-state.ref.ui index e129c9135d..84596a0208 100644 --- a/testsuite/reftests/css-match-inherit-different-state.ref.ui +++ b/testsuite/reftests/css-match-inherit-different-state.ref.ui @@ -1,20 +1,15 @@ - - False popup - True - True - True + 1 + 1 reference - True - False - False + 0 I should be green diff --git a/testsuite/reftests/css-match-inherit-different-state.ui b/testsuite/reftests/css-match-inherit-different-state.ui index c48bae349a..15f803784c 100644 --- a/testsuite/reftests/css-match-inherit-different-state.ui +++ b/testsuite/reftests/css-match-inherit-different-state.ui @@ -1,19 +1,14 @@ - - False popup - True - True - True + 1 + 1 - True - False - False + 0 I should be green diff --git a/testsuite/reftests/css-match-inherit.ref.ui b/testsuite/reftests/css-match-inherit.ref.ui index da1077170e..d3b58f7432 100644 --- a/testsuite/reftests/css-match-inherit.ref.ui +++ b/testsuite/reftests/css-match-inherit.ref.ui @@ -1,17 +1,14 @@ - - False popup reference Hello World - True - True - True - True + 1 + 1 + 1 diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui index 01f5a84717..8395c51add 100644 --- a/testsuite/reftests/css-match-inherit.ui +++ b/testsuite/reftests/css-match-inherit.ui @@ -1,17 +1,14 @@ - - False popup reference Hello World - True - True - True - True + 1 + 1 + 1 diff --git a/testsuite/reftests/css-match-name.ref.ui b/testsuite/reftests/css-match-name.ref.ui index fea1df7c08..5fc9c823dc 100644 --- a/testsuite/reftests/css-match-name.ref.ui +++ b/testsuite/reftests/css-match-name.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False green-20x20.png diff --git a/testsuite/reftests/css-match-name.ui b/testsuite/reftests/css-match-name.ui index ee6db3afc7..ab783b3219 100644 --- a/testsuite/reftests/css-match-name.ui +++ b/testsuite/reftests/css-match-name.ui @@ -1,14 +1,12 @@ - 20 20 - False popup window diff --git a/testsuite/reftests/css-match-siblings.ref.ui b/testsuite/reftests/css-match-siblings.ref.ui index 38ff34a71c..cdd1d6730b 100644 --- a/testsuite/reftests/css-match-siblings.ref.ui +++ b/testsuite/reftests/css-match-siblings.ref.ui @@ -1,49 +1,35 @@ - - False popup - True - False vertical - True - False normal - True - False Red red - True - False Green green - True - False Blue blue - True - False Purple purple diff --git a/testsuite/reftests/css-match-siblings.ui b/testsuite/reftests/css-match-siblings.ui index 91a2dec80b..5e8dfcae6c 100644 --- a/testsuite/reftests/css-match-siblings.ui +++ b/testsuite/reftests/css-match-siblings.ui @@ -1,46 +1,32 @@ - - False popup - True - False vertical - True - False normal - True - False Red - True - False Green - True - False Blue - True - False Purple diff --git a/testsuite/reftests/css-match-type.ref.ui b/testsuite/reftests/css-match-type.ref.ui index fea1df7c08..5fc9c823dc 100644 --- a/testsuite/reftests/css-match-type.ref.ui +++ b/testsuite/reftests/css-match-type.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False green-20x20.png diff --git a/testsuite/reftests/css-match-type.ui b/testsuite/reftests/css-match-type.ui index ee6db3afc7..ab783b3219 100644 --- a/testsuite/reftests/css-match-type.ui +++ b/testsuite/reftests/css-match-type.ui @@ -1,14 +1,12 @@ - 20 20 - False popup window diff --git a/testsuite/reftests/css-multi-state.ref.ui b/testsuite/reftests/css-multi-state.ref.ui index 5b4e55a936..b99269be6b 100644 --- a/testsuite/reftests/css-multi-state.ref.ui +++ b/testsuite/reftests/css-multi-state.ref.ui @@ -1,21 +1,16 @@ - - False popup - True - True - True - True + 1 + 1 + 1 reference - False + 0 - True - False insensitive diff --git a/testsuite/reftests/css-multi-state.ui b/testsuite/reftests/css-multi-state.ui index 1a3aaa6fb9..9f7979e29a 100644 --- a/testsuite/reftests/css-multi-state.ui +++ b/testsuite/reftests/css-multi-state.ui @@ -1,20 +1,15 @@ - - False popup - True - True - True - True - False + 1 + 1 + 1 + 0 - True - False insensitive diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui index eef675c6ee..aa903fb77d 100644 --- a/testsuite/reftests/css-rem-label-size.ref.ui +++ b/testsuite/reftests/css-rem-label-size.ref.ui @@ -1,14 +1,10 @@ - - False popup - True - False ███ diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui index 957716ee86..f70bf80600 100644 --- a/testsuite/reftests/css-rem-label-size.ui +++ b/testsuite/reftests/css-rem-label-size.ui @@ -1,14 +1,10 @@ - - False popup - True - False ███ diff --git a/testsuite/reftests/expander.ref.ui b/testsuite/reftests/expander.ref.ui index 834029fd19..cf55a788dc 100644 --- a/testsuite/reftests/expander.ref.ui +++ b/testsuite/reftests/expander.ref.ui @@ -1,17 +1,13 @@ - - False popup - True - True + 1 Hello - True Hello diff --git a/testsuite/reftests/expander.ui b/testsuite/reftests/expander.ui index 21c3c66eed..628d0c60c9 100644 --- a/testsuite/reftests/expander.ui +++ b/testsuite/reftests/expander.ui @@ -1,19 +1,14 @@ - - False popup - True - False Hello - True + 1 - True Hello diff --git a/testsuite/reftests/fixed-widget-stacking.ref.ui b/testsuite/reftests/fixed-widget-stacking.ref.ui index 436c427367..d40e3f0bac 100644 --- a/testsuite/reftests/fixed-widget-stacking.ref.ui +++ b/testsuite/reftests/fixed-widget-stacking.ref.ui @@ -1,24 +1,17 @@ - - TEST123 TEST123 - False popup - True - False 100 100 - True - False textbuffer1 @@ -26,14 +19,13 @@ TEST123 100 100 - True - True + 1 textbuffer1 + + 50 + 50 + - - 50 - 50 - diff --git a/testsuite/reftests/fixed-widget-stacking.ui b/testsuite/reftests/fixed-widget-stacking.ui index b193343e68..e4737db3d9 100644 --- a/testsuite/reftests/fixed-widget-stacking.ui +++ b/testsuite/reftests/fixed-widget-stacking.ui @@ -1,46 +1,36 @@ - - TEST123 TEST123 - False popup - True - False 100 100 - True - False textbuffer1 - True - False vertical 100 100 - True - True + 1 textbuffer1 + + 50 + 50 + - - 50 - 50 - diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui index 638e528351..a669882851 100644 --- a/testsuite/reftests/flipping-icons.ref.ui +++ b/testsuite/reftests/flipping-icons.ref.ui @@ -1,60 +1,49 @@ - - False popup - True vertical - True - go-last + go-last - True - go-first + go-first - True - media-skip-backward + media-skip-backward - True - media-skip-forward + media-skip-forward - True - media-seek-backward + media-seek-backward - True - media-seek-forward + media-seek-forward - True - pan-end-symbolic + pan-end-symbolic - True - pan-start-symbolic + pan-start-symbolic diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui index 94c81ac7ca..3a508cf48e 100644 --- a/testsuite/reftests/flipping-icons.ui +++ b/testsuite/reftests/flipping-icons.ui @@ -1,62 +1,51 @@ - - False popup - True vertical - True - go-first + go-first - True - go-last + go-last - True - media-skip-forward + media-skip-forward - True - media-skip-backward + media-skip-backward - True - media-seek-forward + media-seek-forward - True - media-seek-backward + media-seek-backward - True - pan-start-symbolic + pan-start-symbolic - True - pan-end-symbolic + pan-end-symbolic diff --git a/testsuite/reftests/font-sizes-names.ref.ui b/testsuite/reftests/font-sizes-names.ref.ui index bcf2fe8d89..da94ffd4ba 100644 --- a/testsuite/reftests/font-sizes-names.ref.ui +++ b/testsuite/reftests/font-sizes-names.ref.ui @@ -1,96 +1,70 @@ - - False popup reference - True - False vertical - True - False xx-small xx-small - True - False x-small x-small - True - False small small - True - False medium medium - True - False large large - True - False x-large x-large - True - False xx-large xx-large - True - False smaller smaller - True - False larger larger - True - False vertical - True - False smaller smaller smaller-smaller @@ -99,13 +73,9 @@ - True - False vertical - True - False larger larger larger-larger diff --git a/testsuite/reftests/font-sizes-names.ui b/testsuite/reftests/font-sizes-names.ui index 3789ac48bb..6c396675cf 100644 --- a/testsuite/reftests/font-sizes-names.ui +++ b/testsuite/reftests/font-sizes-names.ui @@ -1,96 +1,70 @@ - - False popup - True - False vertical - True - False xx-small xx-small - True - False x-small x-small - True - False small small - True - False medium medium - True - False large large - True - False x-large x-large - True - False xx-large xx-large - True - False smaller smaller - True - False larger larger - True - False vertical smaller - True - False smaller smaller smaller @@ -99,14 +73,10 @@ - True - False vertical larger - True - False larger larger larger diff --git a/testsuite/reftests/grid-empty-with-spacing.ref.ui b/testsuite/reftests/grid-empty-with-spacing.ref.ui index dccd1b8bfa..aa2b506bf9 100644 --- a/testsuite/reftests/grid-empty-with-spacing.ref.ui +++ b/testsuite/reftests/grid-empty-with-spacing.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False 5 5 diff --git a/testsuite/reftests/grid-empty-with-spacing.ui b/testsuite/reftests/grid-empty-with-spacing.ui index 23f0caaf6c..5b9e81e76b 100644 --- a/testsuite/reftests/grid-empty-with-spacing.ui +++ b/testsuite/reftests/grid-empty-with-spacing.ui @@ -1,27 +1,22 @@ - - False popup - True - False 5 5 - False - False + 0 invisible + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui index 9139bcdee5..431a73c05f 100644 --- a/testsuite/reftests/grid-expand.ref.ui +++ b/testsuite/reftests/grid-expand.ref.ui @@ -1,65 +1,55 @@ - 100 100 - False popup - True - False 45 10 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - 45 45 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - 10 45 - True - False + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui index 3819ed6500..c0b33be95f 100644 --- a/testsuite/reftests/grid-expand.ui +++ b/testsuite/reftests/grid-expand.ui @@ -1,77 +1,65 @@ - 100 100 - False popup - True - False - True - False 10 10 - True - False - True - True + 1 + 1 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - 10 10 - True - False - True - True - True - True + 1 + 1 + 1 + 1 + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - 10 10 - True - False - True - True + 1 + 1 + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui index 7b87fef07f..d40f0d620d 100644 --- a/testsuite/reftests/grid-homogeneous.ref.ui +++ b/testsuite/reftests/grid-homogeneous.ref.ui @@ -1,133 +1,113 @@ - popup - False - True - False red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 20 20 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - red 30 30 - True - False + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - green 20 30 - True - False + + 1 + 3 + 1 + 1 + - - 1 - 3 - 1 - 1 - red 30 30 - True - False + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - green 30 20 - True - False + + 3 + 1 + 1 + 1 + + + + + + red + 30 + 30 + + 2 + 2 + 1 + 1 + + + + + + green + 30 + 30 + + 3 + 3 + 1 + 1 + - - 3 - 1 - 1 - 1 - - - - red - 30 - 30 - True - False - - - 2 - 2 - 1 - 1 - - - - - green - 30 - 30 - True - False - - - 3 - 3 - 1 - 1 - - diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui index 4e40f2e4b3..43116e11d5 100644 --- a/testsuite/reftests/grid-homogeneous.ui +++ b/testsuite/reftests/grid-homogeneous.ui @@ -1,184 +1,156 @@ - popup - False - True - False - True - False red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 20 20 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False - True + 1 red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 20 20 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - False - True + 1 red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 20 20 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False - True - True + 1 + 1 red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 20 20 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - diff --git a/testsuite/reftests/grid-spacing1.ref.ui b/testsuite/reftests/grid-spacing1.ref.ui index 9e9ee1d5d8..2faa9a0117 100644 --- a/testsuite/reftests/grid-spacing1.ref.ui +++ b/testsuite/reftests/grid-spacing1.ref.ui @@ -1,99 +1,65 @@ - - False popup vertical - True - False - - horizontal - True - False 20 - True One - True Two - True Three - - - - - horizontal - True - False - 0 - True + 1 - True Verylongtext - True Short - - - - - horizontal - True - False - True A - True B - True + 1 - True C - - - diff --git a/testsuite/reftests/grid-spacing1.ui b/testsuite/reftests/grid-spacing1.ui index eda8526a04..004c62ed9d 100644 --- a/testsuite/reftests/grid-spacing1.ui +++ b/testsuite/reftests/grid-spacing1.ui @@ -1,122 +1,100 @@ - - False popup - True - False - - True - False 20 - True One + + 0 + - - 0 - - True Two + + 1 + - - 1 - - True Three + + 2 + - - 2 - + + 0 + 0 + - - 0 - 0 - - - True - False - True + 1 - True Verylongtext + + 0 + - - 0 - - True Short + + 1 + - - 1 - + + 0 + 1 + - - 0 - 1 - - - True - False - True A + + 0 + - - 0 - - True B - True + 1 + + 1 + - - 1 - - True C + + 2 + - - 2 - + + 0 + 2 + - - 0 - 2 - - diff --git a/testsuite/reftests/grid-spacing2.ref.ui b/testsuite/reftests/grid-spacing2.ref.ui index df79827b50..c37863a841 100644 --- a/testsuite/reftests/grid-spacing2.ref.ui +++ b/testsuite/reftests/grid-spacing2.ref.ui @@ -1,93 +1,67 @@ - - False popup - horizontal - True - False - vertical - True - False 20 - True One - True Two - True Three - - vertical - True - False - 0 - True + 1 - True Verylongtext - True Short - - - + vertical - True - False - True A - True B 1 - True C - diff --git a/testsuite/reftests/grid-spacing2.ui b/testsuite/reftests/grid-spacing2.ui index 7688dc3f2b..4c6fd8259b 100644 --- a/testsuite/reftests/grid-spacing2.ui +++ b/testsuite/reftests/grid-spacing2.ui @@ -1,130 +1,108 @@ - - False popup - True - False - - True - False 20 - True One + + 0 + 0 + - - 0 - 0 - - True Two + + 0 + 1 + - - 0 - 1 - - True Three + + 0 + 2 + - - 0 - 2 - + + 0 + 0 + - - 0 - 0 - - - True - False - True + 1 - True Verylongtext + + 0 + 0 + - - 0 - 0 - - True Short + + 0 + 1 + - - 0 - 1 - + + 1 + 0 + - - 1 - 0 - - - True - False - True A + + 0 + 0 + - - 0 - 0 - - True B - True + 1 + + 0 + 1 + - - 0 - 1 - - + - True C + + 0 + 2 + - - 0 - 2 - + + 2 + 0 + - - 2 - 0 - - diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui index 6638fc5138..9aaba61583 100644 --- a/testsuite/reftests/grid-spacing3.ref.ui +++ b/testsuite/reftests/grid-spacing3.ref.ui @@ -1,13 +1,9 @@ - popup - False - True - False 10 5 @@ -15,60 +11,52 @@ red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 30 30 - True - False + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - green 30 30 - True - False + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - red 30 30 - True - False + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui index 5ddbea17bd..bf6f584ce2 100644 --- a/testsuite/reftests/grid-spacing3.ui +++ b/testsuite/reftests/grid-spacing3.ui @@ -1,14 +1,9 @@ - popup - False - - True - False 10 5 @@ -16,60 +11,52 @@ red 30 30 - True - False + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - green 30 30 - True - False + + 10 + 0 + 1 + 1 + - - 10 - 0 - 1 - 1 - green 30 30 - True - False + + 0 + 10 + 1 + 1 + - - 0 - 10 - 1 - 1 - red 30 30 - True - False + + 10 + 10 + 1 + 1 + - - 10 - 10 - 1 - 1 - diff --git a/testsuite/reftests/grid-wfh.ref.ui b/testsuite/reftests/grid-wfh.ref.ui index f01a7d7ea0..ebea05d7e7 100644 --- a/testsuite/reftests/grid-wfh.ref.ui +++ b/testsuite/reftests/grid-wfh.ref.ui @@ -1,38 +1,30 @@ - - False popup - True - False - True - False GNOME is awesome! + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False GNOME is awesome! + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/grid-wfh.ui b/testsuite/reftests/grid-wfh.ui index 8b252eabe9..0e5396a7dd 100644 --- a/testsuite/reftests/grid-wfh.ui +++ b/testsuite/reftests/grid-wfh.ui @@ -1,39 +1,31 @@ - - False popup - True - False - True - False GNOME is awesome! - True + 1 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False GNOME is awesome! + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui index 5f99d6bfb9..d93b42a014 100644 --- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui +++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui @@ -1,14 +1,10 @@ - - False popup - True - False 100 pan-down-symbolic diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui index 0d0015ec3b..c1a1e6014b 100644 --- a/testsuite/reftests/gtk-icontheme-sizing.ui +++ b/testsuite/reftests/gtk-icontheme-sizing.ui @@ -1,16 +1,12 @@ - 100 100 - False popup - True - False vertical diff --git a/testsuite/reftests/gtk-image-effect-inherit.ref.ui b/testsuite/reftests/gtk-image-effect-inherit.ref.ui index 37bb2e2ca0..cc0482913b 100644 --- a/testsuite/reftests/gtk-image-effect-inherit.ref.ui +++ b/testsuite/reftests/gtk-image-effect-inherit.ref.ui @@ -1,32 +1,21 @@ - - - False popup - True - False - True - False dialog-error - True - False dialog-error - True - False dialog-error diff --git a/testsuite/reftests/gtk-image-effect-inherit.ui b/testsuite/reftests/gtk-image-effect-inherit.ui index e41a30a6fe..6ef4925023 100644 --- a/testsuite/reftests/gtk-image-effect-inherit.ui +++ b/testsuite/reftests/gtk-image-effect-inherit.ui @@ -1,68 +1,51 @@ - - - False popup - True - False - True - False - True - False dialog-error + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False - True - False dialog-error + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False - True - False dialog-error + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui index 5cf6418e10..9200097442 100644 --- a/testsuite/reftests/icon-effect-missing.ref.ui +++ b/testsuite/reftests/icon-effect-missing.ref.ui @@ -1,32 +1,22 @@ - - False popup - True - False - True - False image-missing - True - False image-missing - True - False image-missing diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui index 3ef84e9b07..5d432aec96 100644 --- a/testsuite/reftests/icon-effect-missing.ui +++ b/testsuite/reftests/icon-effect-missing.ui @@ -1,32 +1,22 @@ - - False popup - True - False - True - False deine-mudda-gibs-hier-nich - True - False deine-mudda-gibs-hier-nich - True - False deine-mudda-gibs-hier-nich diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui b/testsuite/reftests/icon-shadow-no-transform.ref.ui index e8329becdd..b8c3d8157c 100644 --- a/testsuite/reftests/icon-shadow-no-transform.ref.ui +++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui @@ -1,15 +1,10 @@ - - False popup - - True - False - + diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui index c227940284..503a8b0393 100644 --- a/testsuite/reftests/icon-shadow-no-transform.ui +++ b/testsuite/reftests/icon-shadow-no-transform.ui @@ -1,14 +1,10 @@ - - False popup - True - False diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui index 7b9fd4516d..edf7842d9a 100644 --- a/testsuite/reftests/icon-style-basics.ref.ui +++ b/testsuite/reftests/icon-style-basics.ref.ui @@ -1,10 +1,8 @@ - - @@ -14,108 +12,87 @@ - False popup - True - False - True - False edit-delete + + 1 + 0 + - - 1 - 0 - - True - False icon name + + 0 + 0 + - - 0 - 0 - - True - False symbolic icon name + + 0 + 1 + - - 0 - 1 - - True - False edit-delete + + 2 + 0 + - - 2 - 0 - - True - False edit-delete-symbolic + + 3 + 0 + - - 3 - 0 - - True - False edit-delete-symbolic + + 1 + 1 + - - 1 - 1 - - True - False edit-delete + + 2 + 1 + - - 2 - 1 - - True - False edit-delete-symbolic + + 3 + 1 + - - 3 - 1 - - True - False liststore1 - False - False - False + 0 + 0 + 0 @@ -129,21 +106,19 @@ + + 4 + 0 + - - 4 - 0 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -157,21 +132,19 @@ + + 5 + 0 + - - 5 - 0 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -185,21 +158,19 @@ + + 6 + 0 + - - 6 - 0 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -213,21 +184,19 @@ + + 4 + 1 + - - 4 - 1 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -241,21 +210,19 @@ + + 5 + 1 + - - 5 - 1 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -269,197 +236,163 @@ + + 6 + 1 + - - 6 - 1 - - True - False GThemedIcon + + 0 + 2 + - - 0 - 2 - - True - False symbolic GThemedIcon + + 0 + 3 + - - 0 - 3 - - True - False GEmeblemedIcon + + 0 + 4 + - - 0 - 4 - - True - False symbolic GEmblemedIcon + + 0 + 5 + - - 0 - 5 - - True - False themediconsymbolic + + 1 + 3 + - - 1 - 3 - - True - False themedicon + + 1 + 2 + - - 1 - 2 - - True - False emblemedicon + + 1 + 4 + - - 1 - 4 - - True - False emblemediconsymbolic + + 1 + 5 + - - 1 - 5 - - True - False themedicon + + 2 + 2 + - - 2 - 2 - - True - False themedicon + + 2 + 3 + - - 2 - 3 - - True - False emblemedicon + + 2 + 4 + - - 2 - 4 - - True - False emblemedicon + + 2 + 5 + - - 2 - 5 - - True - False themediconsymbolic + + 3 + 2 + - - 3 - 2 - - True - False themediconsymbolic + + 3 + 3 + - - 3 - 3 - - True - False emblemediconsymbolic + + 3 + 4 + - - 3 - 4 - - True - False emblemediconsymbolic + + 3 + 5 + - - 3 - 5 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -473,21 +406,19 @@ + + 4 + 2 + - - 4 - 2 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -501,21 +432,19 @@ + + 4 + 3 + - - 4 - 3 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -529,21 +458,19 @@ + + 4 + 4 + - - 4 - 4 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -557,21 +484,19 @@ + + 4 + 5 + - - 4 - 5 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -585,21 +510,19 @@ + + 5 + 2 + - - 5 - 2 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -613,21 +536,19 @@ + + 5 + 3 + - - 5 - 3 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -641,21 +562,19 @@ + + 5 + 4 + - - 5 - 4 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -669,21 +588,19 @@ + + 5 + 5 + - - 5 - 5 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -697,21 +614,19 @@ + + 6 + 2 + - - 6 - 2 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -725,21 +640,19 @@ + + 6 + 3 + - - 6 - 3 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -753,21 +666,19 @@ + + 6 + 4 + - - 6 - 4 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -781,11 +692,11 @@ + + 6 + 5 + - - 6 - 5 - diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui index 689cfab213..1d4c07f6de 100644 --- a/testsuite/reftests/icon-style-basics.ui +++ b/testsuite/reftests/icon-style-basics.ui @@ -1,10 +1,8 @@ - - @@ -14,120 +12,99 @@ - False popup - True - False - True - False edit-delete + + 1 + 0 + - - 1 - 0 - - True - False icon name + + 0 + 0 + - - 0 - 0 - - True - False symbolic icon name + + 0 + 1 + - - 0 - 1 - - True - False edit-delete + + 2 + 0 + - - 2 - 0 - - True - False edit-delete + + 3 + 0 + - - 3 - 0 - - True - False edit-delete-symbolic + + 1 + 1 + - - 1 - 1 - - True - False edit-delete-symbolic + + 2 + 1 + - - 2 - 1 - - True - False edit-delete-symbolic + + 3 + 1 + - - 3 - 1 - - True - False liststore1 - False - False - False + 0 + 0 + 0 @@ -141,21 +118,19 @@ + + 4 + 0 + - - 4 - 0 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -172,21 +147,19 @@ + + 5 + 0 + - - 5 - 0 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -203,21 +176,19 @@ + + 6 + 0 + - - 6 - 0 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -231,21 +202,19 @@ + + 4 + 1 + - - 4 - 1 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -262,21 +231,19 @@ + + 5 + 1 + - - 5 - 1 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -293,221 +260,187 @@ + + 6 + 1 + - - 6 - 1 - - True - False GThemedIcon + + 0 + 2 + - - 0 - 2 - - True - False symbolic GThemedIcon + + 0 + 3 + - - 0 - 3 - - True - False GEmeblemedIcon + + 0 + 4 + - - 0 - 4 - - True - False symbolic GEmblemedIcon + + 0 + 5 + - - 0 - 5 - - True - False themediconsymbolic + + 1 + 3 + - - 1 - 3 - - True - False themedicon + + 1 + 2 + - - 1 - 2 - - True - False emblemedicon + + 1 + 4 + - - 1 - 4 - - True - False emblemediconsymbolic + + 1 + 5 + - - 1 - 5 - - True - False themedicon + + 2 + 2 + - - 2 - 2 - - True - False themediconsymbolic + + 2 + 3 + - - 2 - 3 - - True - False emblemedicon + + 2 + 4 + - - 2 - 4 - - True - False emblemediconsymbolic + + 2 + 5 + - - 2 - 5 - - True - False themedicon + + 3 + 2 + - - 3 - 2 - - True - False themediconsymbolic + + 3 + 3 + - - 3 - 3 - - True - False emblemedicon + + 3 + 4 + - - 3 - 4 - - True - False emblemediconsymbolic + + 3 + 5 + - - 3 - 5 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -521,21 +454,19 @@ + + 4 + 2 + - - 4 - 2 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -549,21 +480,19 @@ + + 4 + 3 + - - 4 - 3 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -577,21 +506,19 @@ + + 4 + 4 + - - 4 - 4 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -605,21 +532,19 @@ + + 4 + 5 + - - 4 - 5 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -636,21 +561,19 @@ + + 5 + 2 + - - 5 - 2 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -667,21 +590,19 @@ + + 5 + 3 + - - 5 - 3 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -698,21 +619,19 @@ + + 5 + 4 + - - 5 - 4 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -729,21 +648,19 @@ + + 5 + 5 + - - 5 - 5 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -760,21 +677,19 @@ + + 6 + 2 + - - 6 - 2 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -791,21 +706,19 @@ + + 6 + 3 + - - 6 - 3 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -822,21 +735,19 @@ + + 6 + 4 + - - 6 - 4 - - True - False liststore1 - False - False + 0 + 0 0 - False + 0 @@ -853,11 +764,11 @@ + + 6 + 5 + - - 6 - 5 - diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui index eb9e712f32..d0103a01b3 100644 --- a/testsuite/reftests/icon-vfuncs.ref.ui +++ b/testsuite/reftests/icon-vfuncs.ref.ui @@ -1,67 +1,53 @@ - - False - True - False - True - False Spinner + + 0 + 0 + - - 0 - 0 - - True - False Check + + 0 + 1 + - - 0 - 1 - - True - False Option + + 0 + 2 + - - 0 - 2 - - True - False Arrow + + 0 + 3 + - - 0 - 3 - - True - False Expander + + 0 + 4 + - - 0 - 4 - @@ -69,13 +55,11 @@ 16 center center - True - False + + 1 + 0 + - - 1 - 0 - @@ -83,13 +67,11 @@ 16 center center - True - False + + 1 + 2 + - - 1 - 2 - @@ -97,13 +79,11 @@ 16 center center - True - False + + 1 + 1 + - - 1 - 1 - @@ -111,13 +91,11 @@ 16 center center - True - False + + 1 + 3 + - - 1 - 3 - @@ -125,13 +103,11 @@ 16 center center - True - False + + 1 + 4 + - - 1 - 4 - diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui index f2f215a5d3..bab70ba24a 100644 --- a/testsuite/reftests/icon-vfuncs.ui +++ b/testsuite/reftests/icon-vfuncs.ui @@ -1,126 +1,101 @@ - - False - True - False - True - False Spinner + + 0 + 0 + - - 0 - 0 - - True - False center center + + 1 + 0 + - - 1 - 0 - - True - False Check + + 0 + 1 + - - 0 - 1 - - True - False Option + + 0 + 2 + - - 0 - 2 - - True - False Arrow + + 0 + 3 + - - 0 - 3 - - True - False Expander + + 0 + 4 + - - 0 - 4 - - True - True - False - True + 1 center center + + 1 + 1 + - - 1 - 1 - - True - True - False - True - True + 1 + 1 center center + + 1 + 2 + - - 1 - 2 - - True - False pan-down-symbolic center center + + 1 + 3 + - - 1 - 3 - - True - True + 1 center center @@ -129,11 +104,11 @@ + + 1 + 4 + - - 1 - 4 - diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui index 9e0c3c580b..2ec7dcb502 100644 --- a/testsuite/reftests/iconview-empty.ref.ui +++ b/testsuite/reftests/iconview-empty.ref.ui @@ -1,270 +1,234 @@ - - False popup - True - False 5 5 - True - False center center 0 0 + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False center center 0 0 + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False center center 0 0 + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - - True - False center center 0 0 + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - - True - False center center 0 0 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - False center center 0 0 + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - - True - False center center 0 0 + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - - True - False center center 0 0 + + 3 + 1 + 1 + 1 + - - 3 - 1 - 1 - 1 - - True - False center center 10 10 + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - False center center 10 10 + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - - True - False center center 10 10 + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - - True - False center center 10 10 + + 3 + 2 + 1 + 1 + - - 3 - 2 - 1 - 1 - - True - False center center 10 10 + + 0 + 3 + 1 + 1 + - - 0 - 3 - 1 - 1 - - True - False center center 10 10 + + 1 + 3 + 1 + 1 + - - 1 - 3 - 1 - 1 - - True - False center center 10 10 + + 2 + 3 + 1 + 1 + - - 2 - 3 - 1 - 1 - - True - False center center 10 10 + + 3 + 3 + 1 + 1 + - - 3 - 3 - 1 - 1 - diff --git a/testsuite/reftests/iconview-empty.ui b/testsuite/reftests/iconview-empty.ui index d86efb44ce..a483b42272 100644 --- a/testsuite/reftests/iconview-empty.ui +++ b/testsuite/reftests/iconview-empty.ui @@ -1,57 +1,45 @@ - - False popup - True - False 5 5 - True - False - -1 0 center 0 0 0 center + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False - -1 0 center 5 0 0 center + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False 5 0 center @@ -59,18 +47,16 @@ 0 0 center + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - - True - False 5 0 center @@ -78,56 +64,48 @@ 0 0 center + + 3 + 0 + 1 + 1 + - - 3 - 0 - 1 - 1 - - True - False - -1 5 center 0 0 5 center + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - False - -1 5 center 5 0 5 center + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - - True - False 5 5 center @@ -135,18 +113,16 @@ 0 5 center + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - - True - False 5 5 center @@ -154,56 +130,48 @@ 0 5 center + + 3 + 1 + 1 + 1 + - - 3 - 1 - 1 - 1 - - True - False - -1 0 center 0 5 0 center + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - False - -1 0 center 5 5 0 center + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - - True - False 5 0 center @@ -211,18 +179,16 @@ 5 0 center + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - - True - False 5 0 center @@ -230,56 +196,48 @@ 5 0 center + + 3 + 2 + 1 + 1 + - - 3 - 2 - 1 - 1 - - True - False - -1 5 center 0 5 5 center + + 0 + 3 + 1 + 1 + - - 0 - 3 - 1 - 1 - - True - False - -1 5 center 5 5 5 center + + 1 + 3 + 1 + 1 + - - 1 - 3 - 1 - 1 - - True - False 5 5 center @@ -287,18 +245,16 @@ 5 5 center + + 2 + 3 + 1 + 1 + - - 2 - 3 - 1 - 1 - - True - False 5 5 center @@ -306,13 +262,13 @@ 5 5 center + + 3 + 3 + 1 + 1 + - - 3 - 3 - 1 - 1 - diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui b/testsuite/reftests/image-icon-name-use-fallback.ref.ui index 398dc714cc..8ba61ab4bd 100644 --- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui +++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui @@ -1,16 +1,12 @@ - - False popup - True - False edit-delete - True + 1 diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui b/testsuite/reftests/image-icon-name-use-fallback.ui index 442664c5ec..10fefbd028 100644 --- a/testsuite/reftests/image-icon-name-use-fallback.ui +++ b/testsuite/reftests/image-icon-name-use-fallback.ui @@ -1,16 +1,12 @@ - - False popup - True - False edit-delete-lolwtfbbq - True + 1 diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui b/testsuite/reftests/image-icon-shadow-clipping.ref.ui index c670508230..7573765213 100644 --- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui +++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui @@ -1,16 +1,12 @@ - 100 100 - False popup - True - False edit-delete diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui b/testsuite/reftests/image-icon-shadow-clipping.ui index 161b089d51..4f88c0f0ee 100644 --- a/testsuite/reftests/image-icon-shadow-clipping.ui +++ b/testsuite/reftests/image-icon-shadow-clipping.ui @@ -1,23 +1,17 @@ - 100 100 - False popup - True - False center center vertical - True - False edit-delete diff --git a/testsuite/reftests/image-load-from-file.ref.ui b/testsuite/reftests/image-load-from-file.ref.ui index ca9be604f7..6ebe6b9f90 100644 --- a/testsuite/reftests/image-load-from-file.ref.ui +++ b/testsuite/reftests/image-load-from-file.ref.ui @@ -1,8 +1,6 @@ - - False popup diff --git a/testsuite/reftests/image-load-from-file.ui b/testsuite/reftests/image-load-from-file.ui index 2ea571d7e6..8e7a5446ce 100644 --- a/testsuite/reftests/image-load-from-file.ui +++ b/testsuite/reftests/image-load-from-file.ui @@ -1,6 +1,5 @@ - popup diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui index e978c242c8..bf193f0fb1 100644 --- a/testsuite/reftests/inherit-and-initial.ref.ui +++ b/testsuite/reftests/inherit-and-initial.ref.ui @@ -1,3 +1,4 @@ + 100 @@ -312,55 +313,45 @@ Suspendisse feugiat quam quis dolor accumsan cursus. + 1 inherit Save 1 document-save - - 1 - + 1 inherit Open 1 document-open - - 1 - + 1 inherit - - 1 - + 1 inherit Find 1 edit-find - - 1 - + 1 inherit - - 1 - @@ -469,22 +460,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit 1 1 + + 0 + 0 + - - 0 - 0 - checkbutton inherit 1 + + 0 + 1 + - - 0 - 1 - @@ -492,11 +483,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit 1 1 + + 0 + 2 + - - 0 - 2 - @@ -505,11 +496,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 1 1 + + 0 + 3 + - - 0 - 3 - @@ -517,11 +508,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit 0 1 + + 0 + 4 + - - 0 - 4 - @@ -530,11 +521,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 1 1 + + 0 + 5 + - - 0 - 5 - @@ -542,11 +533,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit 1 1 + + 1 + 0 + - - 1 - 0 - @@ -555,11 +546,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton1 + + 1 + 1 + - - 1 - 1 - @@ -569,11 +560,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton1 + + 1 + 2 + - - 1 - 2 - @@ -582,11 +573,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 1 1 + + 1 + 3 + - - 1 - 3 - @@ -596,11 +587,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton3 + + 1 + 4 + - - 1 - 4 - @@ -611,30 +602,30 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton3 + + 1 + 5 + - - 1 - 5 - inherit + + 0 + 6 + - - 0 - 6 - inherit 0 + + 1 + 6 + - - 1 - 6 - diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui index c08b2d8a11..9a587ea907 100644 --- a/testsuite/reftests/inherit-and-initial.ui +++ b/testsuite/reftests/inherit-and-initial.ui @@ -1,3 +1,4 @@ + 100 @@ -272,49 +273,40 @@ Suspendisse feugiat quam quis dolor accumsan cursus. + 1 Save 1 document-save - - 1 - + 1 Open 1 document-open - - 1 - - - + 1 - + + 1 Find 1 edit-find - - 1 - + 1 - - 1 - @@ -408,32 +400,32 @@ Suspendisse feugiat quam quis dolor accumsan cursus. checkbutton 1 1 + + 0 + 0 + - - 0 - 0 - checkbutton 1 + + 0 + 1 + - - 0 - 1 - checkbutton 1 1 + + 0 + 2 + - - 0 - 2 - @@ -441,22 +433,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 1 1 + + 0 + 3 + - - 0 - 3 - checkbutton 0 1 + + 0 + 4 + - - 0 - 4 - @@ -464,22 +456,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 1 1 + + 0 + 5 + - - 0 - 5 - radiobutton 1 1 + + 1 + 0 + - - 1 - 0 - @@ -487,11 +479,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton1 + + 1 + 1 + - - 1 - 1 - @@ -500,11 +492,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton1 + + 1 + 2 + - - 1 - 2 - @@ -512,11 +504,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 1 1 + + 1 + 3 + - - 1 - 3 - @@ -525,11 +517,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton3 + + 1 + 4 + - - 1 - 4 - @@ -539,27 +531,28 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 1 radiobutton3 + + 1 + 5 + - - 1 - 5 - - - - 0 - 6 - + + + 0 + 6 + + 0 + + 1 + 6 + - - 1 - 6 - diff --git a/testsuite/reftests/label-attribute-preference.ref.ui b/testsuite/reftests/label-attribute-preference.ref.ui index 77f9b28709..2d45923300 100644 --- a/testsuite/reftests/label-attribute-preference.ref.ui +++ b/testsuite/reftests/label-attribute-preference.ref.ui @@ -1,22 +1,18 @@ - - False popup - True - False Hello linky World - - - - - - - + + + + + + + diff --git a/testsuite/reftests/label-attribute-preference.ui b/testsuite/reftests/label-attribute-preference.ui index fb268216cc..ae9fbfe046 100644 --- a/testsuite/reftests/label-attribute-preference.ui +++ b/testsuite/reftests/label-attribute-preference.ui @@ -1,18 +1,14 @@ - - False popup - True - False - True - H<span color="#008000">ell</span>o <a href="http://example.com">l<span color="#00FF00">in</span>ky</a> <span color="#80FF80">Worl</span>d + 1 + H<span color="#008000">ell</span>o <a href="http://example.com">l<span color="#00FF00">in</span>ky</a> <span color="#80FF80">Worl</span>d - - + + diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui index 50522287ea..1bda217d61 100644 --- a/testsuite/reftests/label-background.ref.ui +++ b/testsuite/reftests/label-background.ref.ui @@ -1,14 +1,10 @@ - - False popup - True - False Hello World! diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui index b79f28e837..3f7117ee31 100644 --- a/testsuite/reftests/label-background.ui +++ b/testsuite/reftests/label-background.ui @@ -1,25 +1,17 @@ - - False popup - True - False - True - False Hello - True - False World! diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui index 31f744d3a9..97be53210b 100644 --- a/testsuite/reftests/label-box-shadow-clip.ref.ui +++ b/testsuite/reftests/label-box-shadow-clip.ref.ui @@ -1,16 +1,12 @@ - 100 100 - False popup - True - False center center X diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui index 03741621b7..7672f7db14 100644 --- a/testsuite/reftests/label-box-shadow-clip.ui +++ b/testsuite/reftests/label-box-shadow-clip.ui @@ -1,16 +1,12 @@ - 100 100 - False popup - True - False center center X diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui index 13eba47fc0..905cf05636 100644 --- a/testsuite/reftests/label-clipping.ref.ui +++ b/testsuite/reftests/label-clipping.ref.ui @@ -1,15 +1,11 @@ - 500 - False popup - True - False fffffffff diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui index 56d5ad06d2..058d66b280 100644 --- a/testsuite/reftests/label-clipping.ui +++ b/testsuite/reftests/label-clipping.ui @@ -1,22 +1,16 @@ - 500 - False popup - True - False center center vertical - True - False fffffffff diff --git a/testsuite/reftests/label-ellipsize-small.ref.ui b/testsuite/reftests/label-ellipsize-small.ref.ui index dd7bb852c5..20c9277b9d 100644 --- a/testsuite/reftests/label-ellipsize-small.ref.ui +++ b/testsuite/reftests/label-ellipsize-small.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False d diff --git a/testsuite/reftests/label-ellipsize-small.ui b/testsuite/reftests/label-ellipsize-small.ui index c2d4fd0ed7..7b7ca38894 100644 --- a/testsuite/reftests/label-ellipsize-small.ui +++ b/testsuite/reftests/label-ellipsize-small.ui @@ -1,13 +1,9 @@ - - False popup - True - False d end diff --git a/testsuite/reftests/label-ellipsize-with-big.ref.ui b/testsuite/reftests/label-ellipsize-with-big.ref.ui index 59e21f5020..18dff6e51a 100644 --- a/testsuite/reftests/label-ellipsize-with-big.ref.ui +++ b/testsuite/reftests/label-ellipsize-with-big.ref.ui @@ -1,15 +1,11 @@ - - False popup - True - False - <big><b>There's a space in front</b></big> - True + <big><b>There's a space in front</b></big> + 1 end diff --git a/testsuite/reftests/label-ellipsize-with-big.ui b/testsuite/reftests/label-ellipsize-with-big.ui index 59e21f5020..18dff6e51a 100644 --- a/testsuite/reftests/label-ellipsize-with-big.ui +++ b/testsuite/reftests/label-ellipsize-with-big.ui @@ -1,15 +1,11 @@ - - False popup - True - False - <big><b>There's a space in front</b></big> - True + <big><b>There's a space in front</b></big> + 1 end diff --git a/testsuite/reftests/label-shadows.ref.ui b/testsuite/reftests/label-shadows.ref.ui index d94ec4d791..6523efea03 100644 --- a/testsuite/reftests/label-shadows.ref.ui +++ b/testsuite/reftests/label-shadows.ref.ui @@ -1,168 +1,140 @@ - - False popup - True - False - True - False - True - False ABC - + + + 2 + 2 + - - 2 - 2 - - True - False ABC + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False - True - False ABC - + + + 2 + 0 + - - 2 - 0 - - True - False ABC + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False - True - False ABC - + + + 0 + 0 + - - 0 - 0 - - True - False ABC + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - - True - False - True - False ABC - + + + 0 + 2 + - - 0 - 2 - - True - False ABC + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/label-shadows.ui b/testsuite/reftests/label-shadows.ui index 0617608184..d3093d6dca 100644 --- a/testsuite/reftests/label-shadows.ui +++ b/testsuite/reftests/label-shadows.ui @@ -1,72 +1,60 @@ - - False popup - True - False - True - False start start ABC + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False start start ABC + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False start start ABC + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - - True - False start start ABC + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui index 6e4b0f4c06..d1ac565dc8 100644 --- a/testsuite/reftests/label-sizing.ref.ui +++ b/testsuite/reftests/label-sizing.ref.ui @@ -1,3 +1,4 @@ + popup @@ -10,97 +11,95 @@ wrap + + 0 + 0 + - - 0 - 0 - ellipsize + + 1 + 0 + - - 1 - 0 - width-chars + + 2 + 0 + - - 2 - 0 - max-width-chars + + 3 + 0 + - - 3 - 0 - results + + 4 + 0 + - - 4 - 0 - False + + 0 + 1 + - - 0 - 1 - none + + 1 + 1 + - - 1 - 1 - -1 + + 2 + 1 + - - 2 - 1 - -1 + + 3 + 1 + - - 3 - 1 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -129,10 +128,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -159,61 +157,59 @@ + + 4 + 1 + - - 4 - 1 - True + + 0 + 2 + - - 0 - 2 - none + + 1 + 2 + - - 1 - 2 - -1 + + 2 + 2 + - - 2 - 2 - -1 + + 3 + 2 + - - 3 - 2 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -244,10 +240,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -274,61 +269,59 @@ ABCD + + 4 + 2 + - - 4 - 2 - False + + 0 + 3 + - - 0 - 3 - end + + 1 + 3 + - - 1 - 3 - -1 + + 2 + 3 + - - 2 - 3 - -1 + + 3 + 3 + - - 3 - 3 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -357,10 +350,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -387,61 +379,59 @@ ABCD + + 4 + 3 + - - 4 - 3 - True + + 0 + 4 + - - 0 - 4 - end + + 1 + 4 + - - 1 - 4 - -1 + + 2 + 4 + - - 2 - 4 - -1 + + 3 + 4 + - - 3 - 4 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -470,10 +460,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -500,61 +489,59 @@ ABCD + + 4 + 4 + - - 4 - 4 - False + + 0 + 5 + - - 0 - 5 - none + + 1 + 5 + - - 1 - 5 - 4 + + 2 + 5 + - - 2 - 5 - -1 + + 3 + 5 + - - 3 - 5 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -585,10 +572,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -617,61 +603,59 @@ ABCD + + 4 + 5 + - - 4 - 5 - True + + 0 + 6 + - - 0 - 6 - none + + 1 + 6 + - - 1 - 6 - 4 + + 2 + 6 + - - 2 - 6 - -1 + + 3 + 6 + - - 3 - 6 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -704,10 +688,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -736,61 +719,59 @@ ABCD + + 4 + 6 + - - 4 - 6 - False + + 0 + 7 + - - 0 - 7 - end + + 1 + 7 + - - 1 - 7 - 4 + + 2 + 7 + - - 2 - 7 - -1 + + 3 + 7 + - - 3 - 7 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -821,10 +802,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -853,61 +833,59 @@ ABCD + + 4 + 7 + - - 4 - 7 - True + + 0 + 8 + - - 0 - 8 - end + + 1 + 8 + - - 1 - 8 - 4 + + 2 + 8 + - - 2 - 8 - -1 + + 3 + 8 + - - 3 - 8 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -938,10 +916,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -970,61 +947,59 @@ ABCD + + 4 + 8 + - - 4 - 8 - False + + 0 + 9 + - - 0 - 9 - none + + 1 + 9 + - - 1 - 9 - 8 + + 2 + 9 + - - 2 - 9 - -1 + + 3 + 9 + - - 3 - 9 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1055,10 +1030,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1087,61 +1061,59 @@ ABCD + + 4 + 9 + - - 4 - 9 - True + + 0 + 10 + - - 0 - 10 - none + + 1 + 10 + - - 1 - 10 - 8 + + 2 + 10 + - - 2 - 10 - -1 + + 3 + 10 + - - 3 - 10 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1174,10 +1146,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1206,61 +1177,59 @@ ABCD + + 4 + 10 + - - 4 - 10 - False + + 0 + 11 + - - 0 - 11 - end + + 1 + 11 + - - 1 - 11 - 8 + + 2 + 11 + - - 2 - 11 - -1 + + 3 + 11 + - - 3 - 11 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1291,10 +1260,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1323,61 +1291,59 @@ ABCD + + 4 + 11 + - - 4 - 11 - True + + 0 + 12 + - - 0 - 12 - end + + 1 + 12 + - - 1 - 12 - 8 + + 2 + 12 + - - 2 - 12 - -1 + + 3 + 12 + - - 3 - 12 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1408,10 +1374,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1440,61 +1405,59 @@ ABCD + + 4 + 12 + - - 4 - 12 - False + + 0 + 13 + - - 0 - 13 - none + + 1 + 13 + - - 1 - 13 - 12 + + 2 + 13 + - - 2 - 13 - -1 + + 3 + 13 + - - 3 - 13 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1525,10 +1488,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1557,61 +1519,59 @@ ABCD + + 4 + 13 + - - 4 - 13 - True + + 0 + 14 + - - 0 - 14 - none + + 1 + 14 + - - 1 - 14 - 12 + + 2 + 14 + - - 2 - 14 - -1 + + 3 + 14 + - - 3 - 14 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1642,10 +1602,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1674,61 +1633,59 @@ ABCD + + 4 + 14 + - - 4 - 14 - False + + 0 + 15 + - - 0 - 15 - end + + 1 + 15 + - - 1 - 15 - 12 + + 2 + 15 + - - 2 - 15 - -1 + + 3 + 15 + - - 3 - 15 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1759,10 +1716,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1791,61 +1747,59 @@ ABCD + + 4 + 15 + - - 4 - 15 - True + + 0 + 16 + - - 0 - 16 - end + + 1 + 16 + - - 1 - 16 - 12 + + 2 + 16 + - - 2 - 16 - -1 + + 3 + 16 + - - 3 - 16 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1876,10 +1830,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1908,61 +1861,59 @@ ABCD + + 4 + 16 + - - 4 - 16 - False + + 0 + 17 + - - 0 - 17 - none + + 1 + 17 + - - 1 - 17 - -1 + + 2 + 17 + - - 2 - 17 - 4 + + 3 + 17 + - - 3 - 17 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1993,10 +1944,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2025,61 +1975,59 @@ ABCD + + 4 + 17 + - - 4 - 17 - True + + 0 + 18 + - - 0 - 18 - none + + 1 + 18 + - - 1 - 18 - -1 + + 2 + 18 + - - 2 - 18 - 4 + + 3 + 18 + - - 3 - 18 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2112,10 +2060,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2146,61 +2093,59 @@ ABCD + + 4 + 18 + - - 4 - 18 - False + + 0 + 19 + - - 0 - 19 - end + + 1 + 19 + - - 1 - 19 - -1 + + 2 + 19 + - - 2 - 19 - 4 + + 3 + 19 + - - 3 - 19 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2231,10 +2176,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2263,61 +2207,59 @@ ABCD + + 4 + 19 + - - 4 - 19 - True + + 0 + 20 + - - 0 - 20 - end + + 1 + 20 + - - 1 - 20 - -1 + + 2 + 20 + - - 2 - 20 - 4 + + 3 + 20 + - - 3 - 20 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2348,10 +2290,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2380,61 +2321,59 @@ ABCD + + 4 + 20 + - - 4 - 20 - False + + 0 + 21 + - - 0 - 21 - none + + 1 + 21 + - - 1 - 21 - 4 + + 2 + 21 + - - 2 - 21 - 4 + + 3 + 21 + - - 3 - 21 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2467,10 +2406,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2501,61 +2439,59 @@ ABCD + + 4 + 21 + - - 4 - 21 - True + + 0 + 22 + - - 0 - 22 - none + + 1 + 22 + - - 1 - 22 - 4 + + 2 + 22 + - - 2 - 22 - 4 + + 3 + 22 + - - 3 - 22 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2590,10 +2526,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2626,61 +2561,59 @@ ABCD + + 4 + 22 + - - 4 - 22 - False + + 0 + 23 + - - 0 - 23 - end + + 1 + 23 + - - 1 - 23 - 4 + + 2 + 23 + - - 2 - 23 - 4 + + 3 + 23 + - - 3 - 23 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2713,10 +2646,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2747,61 +2679,59 @@ ABCD + + 4 + 23 + - - 4 - 23 - True + + 0 + 24 + - - 0 - 24 - end + + 1 + 24 + - - 1 - 24 - 4 + + 2 + 24 + - - 2 - 24 - 4 + + 3 + 24 + - - 3 - 24 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2834,10 +2764,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2868,61 +2797,59 @@ ABCD + + 4 + 24 + - - 4 - 24 - False + + 0 + 25 + - - 0 - 25 - none + + 1 + 25 + - - 1 - 25 - 8 + + 2 + 25 + - - 2 - 25 - 4 + + 3 + 25 + - - 3 - 25 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2955,10 +2882,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2989,61 +2915,59 @@ ABCD + + 4 + 25 + - - 4 - 25 - True + + 0 + 26 + - - 0 - 26 - none + + 1 + 26 + - - 1 - 26 - 8 + + 2 + 26 + - - 2 - 26 - 4 + + 3 + 26 + - - 3 - 26 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3078,10 +3002,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3114,61 +3037,59 @@ ABCD + + 4 + 26 + - - 4 - 26 - False + + 0 + 27 + - - 0 - 27 - end + + 1 + 27 + - - 1 - 27 - 8 + + 2 + 27 + - - 2 - 27 - 4 + + 3 + 27 + - - 3 - 27 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3201,10 +3122,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3235,61 +3155,59 @@ ABCD + + 4 + 27 + - - 4 - 27 - True + + 0 + 28 + - - 0 - 28 - end + + 1 + 28 + - - 1 - 28 - 8 + + 2 + 28 + - - 2 - 28 - 4 + + 3 + 28 + - - 3 - 28 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3322,10 +3240,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3356,61 +3273,59 @@ ABCD + + 4 + 28 + - - 4 - 28 - False + + 0 + 29 + - - 0 - 29 - none + + 1 + 29 + - - 1 - 29 - 12 + + 2 + 29 + - - 2 - 29 - 4 + + 3 + 29 + - - 3 - 29 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3443,10 +3358,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3477,61 +3391,59 @@ ABCD + + 4 + 29 + - - 4 - 29 - True + + 0 + 30 + - - 0 - 30 - none + + 1 + 30 + - - 1 - 30 - 12 + + 2 + 30 + - - 2 - 30 - 4 + + 3 + 30 + - - 3 - 30 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3564,10 +3476,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3598,61 +3509,59 @@ ABCD + + 4 + 30 + - - 4 - 30 - False + + 0 + 31 + - - 0 - 31 - end + + 1 + 31 + - - 1 - 31 - 12 + + 2 + 31 + - - 2 - 31 - 4 + + 3 + 31 + - - 3 - 31 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3685,10 +3594,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3719,61 +3627,59 @@ ABCD + + 4 + 31 + - - 4 - 31 - True + + 0 + 32 + - - 0 - 32 - end + + 1 + 32 + - - 1 - 32 - 12 + + 2 + 32 + - - 2 - 32 - 4 + + 3 + 32 + - - 3 - 32 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3806,10 +3712,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3840,61 +3745,59 @@ ABCD + + 4 + 32 + - - 4 - 32 - False + + 0 + 33 + - - 0 - 33 - none + + 1 + 33 + - - 1 - 33 - -1 + + 2 + 33 + - - 2 - 33 - 8 + + 3 + 33 + - - 3 - 33 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3925,10 +3828,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3957,61 +3859,59 @@ ABCD + + 4 + 33 + - - 4 - 33 - True + + 0 + 34 + - - 0 - 34 - none + + 1 + 34 + - - 1 - 34 - -1 + + 2 + 34 + - - 2 - 34 - 8 + + 3 + 34 + - - 3 - 34 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4044,10 +3944,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4078,61 +3977,59 @@ ABCD + + 4 + 34 + - - 4 - 34 - False + + 0 + 35 + - - 0 - 35 - end + + 1 + 35 + - - 1 - 35 - -1 + + 2 + 35 + - - 2 - 35 - 8 + + 3 + 35 + - - 3 - 35 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4163,10 +4060,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4195,61 +4091,59 @@ ABCD + + 4 + 35 + - - 4 - 35 - True + + 0 + 36 + - - 0 - 36 - end + + 1 + 36 + - - 1 - 36 - -1 + + 2 + 36 + - - 2 - 36 - 8 + + 3 + 36 + - - 3 - 36 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4280,10 +4174,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4312,61 +4205,59 @@ ABCD + + 4 + 36 + - - 4 - 36 - False + + 0 + 37 + - - 0 - 37 - none + + 1 + 37 + - - 1 - 37 - 4 + + 2 + 37 + - - 2 - 37 - 8 + + 3 + 37 + - - 3 - 37 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4399,10 +4290,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4433,61 +4323,59 @@ ABCD + + 4 + 37 + - - 4 - 37 - True + + 0 + 38 + - - 0 - 38 - none + + 1 + 38 + - - 1 - 38 - 4 + + 2 + 38 + - - 2 - 38 - 8 + + 3 + 38 + - - 3 - 38 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4522,10 +4410,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4558,61 +4445,59 @@ ABCD + + 4 + 38 + - - 4 - 38 - False + + 0 + 39 + - - 0 - 39 - end + + 1 + 39 + - - 1 - 39 - 4 + + 2 + 39 + - - 2 - 39 - 8 + + 3 + 39 + - - 3 - 39 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4645,10 +4530,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4679,61 +4563,59 @@ ABCD + + 4 + 39 + - - 4 - 39 - True + + 0 + 40 + - - 0 - 40 - end + + 1 + 40 + - - 1 - 40 - 4 + + 2 + 40 + - - 2 - 40 - 8 + + 3 + 40 + - - 3 - 40 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4766,10 +4648,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4800,61 +4681,59 @@ ABCD + + 4 + 40 + - - 4 - 40 - False + + 0 + 41 + - - 0 - 41 - none + + 1 + 41 + - - 1 - 41 - 8 + + 2 + 41 + - - 2 - 41 - 8 + + 3 + 41 + - - 3 - 41 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4887,10 +4766,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4921,61 +4799,59 @@ ABCD + + 4 + 41 + - - 4 - 41 - True + + 0 + 42 + - - 0 - 42 - none + + 1 + 42 + - - 1 - 42 - 8 + + 2 + 42 + - - 2 - 42 - 8 + + 3 + 42 + - - 3 - 42 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5010,10 +4886,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5046,61 +4921,59 @@ ABCD + + 4 + 42 + - - 4 - 42 - False + + 0 + 43 + - - 0 - 43 - end + + 1 + 43 + - - 1 - 43 - 8 + + 2 + 43 + - - 2 - 43 - 8 + + 3 + 43 + - - 3 - 43 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5133,10 +5006,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5167,61 +5039,59 @@ ABCD + + 4 + 43 + - - 4 - 43 - True + + 0 + 44 + - - 0 - 44 - end + + 1 + 44 + - - 1 - 44 - 8 + + 2 + 44 + - - 2 - 44 - 8 + + 3 + 44 + - - 3 - 44 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5254,10 +5124,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5288,61 +5157,59 @@ ABCD + + 4 + 44 + - - 4 - 44 - False + + 0 + 45 + - - 0 - 45 - none + + 1 + 45 + - - 1 - 45 - 12 + + 2 + 45 + - - 2 - 45 - 8 + + 3 + 45 + - - 3 - 45 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5375,10 +5242,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5409,61 +5275,59 @@ ABCD + + 4 + 45 + - - 4 - 45 - True + + 0 + 46 + - - 0 - 46 - none + + 1 + 46 + - - 1 - 46 - 12 + + 2 + 46 + - - 2 - 46 - 8 + + 3 + 46 + - - 3 - 46 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5496,10 +5360,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5530,61 +5393,59 @@ ABCD + + 4 + 46 + - - 4 - 46 - False + + 0 + 47 + - - 0 - 47 - end + + 1 + 47 + - - 1 - 47 - 12 + + 2 + 47 + - - 2 - 47 - 8 + + 3 + 47 + - - 3 - 47 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5617,10 +5478,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5651,61 +5511,59 @@ ABCD + + 4 + 47 + - - 4 - 47 - True + + 0 + 48 + - - 0 - 48 - end + + 1 + 48 + - - 1 - 48 - 12 + + 2 + 48 + - - 2 - 48 - 8 + + 3 + 48 + - - 3 - 48 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5738,10 +5596,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5772,61 +5629,59 @@ ABCD + + 4 + 48 + - - 4 - 48 - False + + 0 + 49 + - - 0 - 49 - none + + 1 + 49 + - - 1 - 49 - -1 + + 2 + 49 + - - 2 - 49 - 12 + + 3 + 49 + - - 3 - 49 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5857,10 +5712,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5889,61 +5743,59 @@ ABCD + + 4 + 49 + - - 4 - 49 - True + + 0 + 50 + - - 0 - 50 - none + + 1 + 50 + - - 1 - 50 - -1 + + 2 + 50 + - - 2 - 50 - 12 + + 3 + 50 + - - 3 - 50 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5976,10 +5828,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6008,61 +5859,59 @@ ABCD + + 4 + 50 + - - 4 - 50 - False + + 0 + 51 + - - 0 - 51 - end + + 1 + 51 + - - 1 - 51 - -1 + + 2 + 51 + - - 2 - 51 - 12 + + 3 + 51 + - - 3 - 51 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6093,10 +5942,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6125,61 +5973,59 @@ ABCD + + 4 + 51 + - - 4 - 51 - True + + 0 + 52 + - - 0 - 52 - end + + 1 + 52 + - - 1 - 52 - -1 + + 2 + 52 + - - 2 - 52 - 12 + + 3 + 52 + - - 3 - 52 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6210,10 +6056,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6242,61 +6087,59 @@ ABCD + + 4 + 52 + - - 4 - 52 - False + + 0 + 53 + - - 0 - 53 - none + + 1 + 53 + - - 1 - 53 - 4 + + 2 + 53 + - - 2 - 53 - 12 + + 3 + 53 + - - 3 - 53 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6329,10 +6172,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6363,61 +6205,59 @@ ABCD + + 4 + 53 + - - 4 - 53 - True + + 0 + 54 + - - 0 - 54 - none + + 1 + 54 + - - 1 - 54 - 4 + + 2 + 54 + - - 2 - 54 - 12 + + 3 + 54 + - - 3 - 54 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6452,10 +6292,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6486,61 +6325,59 @@ ABCD + + 4 + 54 + - - 4 - 54 - False + + 0 + 55 + - - 0 - 55 - end + + 1 + 55 + - - 1 - 55 - 4 + + 2 + 55 + - - 2 - 55 - 12 + + 3 + 55 + - - 3 - 55 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6573,10 +6410,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6607,61 +6443,59 @@ ABCD + + 4 + 55 + - - 4 - 55 - True + + 0 + 56 + - - 0 - 56 - end + + 1 + 56 + - - 1 - 56 - 4 + + 2 + 56 + - - 2 - 56 - 12 + + 3 + 56 + - - 3 - 56 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6694,10 +6528,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6728,61 +6561,59 @@ ABCD + + 4 + 56 + - - 4 - 56 - False + + 0 + 57 + - - 0 - 57 - none + + 1 + 57 + - - 1 - 57 - 8 + + 2 + 57 + - - 2 - 57 - 12 + + 3 + 57 + - - 3 - 57 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6815,10 +6646,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6849,61 +6679,59 @@ ABCD + + 4 + 57 + - - 4 - 57 - True + + 0 + 58 + - - 0 - 58 - none + + 1 + 58 + - - 1 - 58 - 8 + + 2 + 58 + - - 2 - 58 - 12 + + 3 + 58 + - - 3 - 58 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6938,10 +6766,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6972,61 +6799,59 @@ ABCD + + 4 + 58 + - - 4 - 58 - False + + 0 + 59 + - - 0 - 59 - end + + 1 + 59 + - - 1 - 59 - 8 + + 2 + 59 + - - 2 - 59 - 12 + + 3 + 59 + - - 3 - 59 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7059,10 +6884,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7093,61 +6917,59 @@ ABCD + + 4 + 59 + - - 4 - 59 - True + + 0 + 60 + - - 0 - 60 - end + + 1 + 60 + - - 1 - 60 - 8 + + 2 + 60 + - - 2 - 60 - 12 + + 3 + 60 + - - 3 - 60 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7180,10 +7002,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7214,61 +7035,59 @@ ABCD + + 4 + 60 + - - 4 - 60 - False + + 0 + 61 + - - 0 - 61 - none + + 1 + 61 + - - 1 - 61 - 12 + + 2 + 61 + - - 2 - 61 - 12 + + 3 + 61 + - - 3 - 61 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7301,10 +7120,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7335,61 +7153,59 @@ ABCD + + 4 + 61 + - - 4 - 61 - True + + 0 + 62 + - - 0 - 62 - none + + 1 + 62 + - - 1 - 62 - 12 + + 2 + 62 + - - 2 - 62 - 12 + + 3 + 62 + - - 3 - 62 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7422,10 +7238,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7456,61 +7271,59 @@ ABCD + + 4 + 62 + - - 4 - 62 - False + + 0 + 63 + - - 0 - 63 - end + + 1 + 63 + - - 1 - 63 - 12 + + 2 + 63 + - - 2 - 63 - 12 + + 3 + 63 + - - 3 - 63 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7543,10 +7356,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7577,61 +7389,59 @@ ABCD + + 4 + 63 + - - 4 - 63 - True + + 0 + 64 + - - 0 - 64 - end + + 1 + 64 + - - 1 - 64 - 12 + + 2 + 64 + - - 2 - 64 - 12 + + 3 + 64 + - - 3 - 64 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7664,10 +7474,9 @@ ABCD - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7698,11 +7507,11 @@ ABCD + + 4 + 64 + - - 4 - 64 - diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui index b5fea3e15e..69784ba8ee 100644 --- a/testsuite/reftests/label-sizing.ui +++ b/testsuite/reftests/label-sizing.ui @@ -1,3 +1,4 @@ + popup @@ -10,97 +11,95 @@ wrap + + 0 + 0 + - - 0 - 0 - ellipsize + + 1 + 0 + - - 1 - 0 - width-chars + + 2 + 0 + - - 2 - 0 - max-width-chars + + 3 + 0 + - - 3 - 0 - results + + 4 + 0 + - - 4 - 0 - False + + 0 + 1 + - - 0 - 1 - none + + 1 + 1 + - - 1 - 1 - -1 + + 2 + 1 + - - 2 - 1 - -1 + + 3 + 1 + - - 3 - 1 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -129,10 +128,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -159,61 +157,59 @@ + + 4 + 1 + - - 4 - 1 - True + + 0 + 2 + - - 0 - 2 - none + + 1 + 2 + - - 1 - 2 - -1 + + 2 + 2 + - - 2 - 2 - -1 + + 3 + 2 + - - 3 - 2 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -244,10 +240,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -276,61 +271,59 @@ + + 4 + 2 + - - 4 - 2 - False + + 0 + 3 + - - 0 - 3 - end + + 1 + 3 + - - 1 - 3 - -1 + + 2 + 3 + - - 2 - 3 - -1 + + 3 + 3 + - - 3 - 3 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -361,10 +354,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -393,61 +385,59 @@ + + 4 + 3 + - - 4 - 3 - True + + 0 + 4 + - - 0 - 4 - end + + 1 + 4 + - - 1 - 4 - -1 + + 2 + 4 + - - 2 - 4 - -1 + + 3 + 4 + - - 3 - 4 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -480,10 +470,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -514,61 +503,59 @@ + + 4 + 4 + - - 4 - 4 - False + + 0 + 5 + - - 0 - 5 - none + + 1 + 5 + - - 1 - 5 - 4 + + 2 + 5 + - - 2 - 5 - -1 + + 3 + 5 + - - 3 - 5 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -599,10 +586,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -631,61 +617,59 @@ + + 4 + 5 + - - 4 - 5 - True + + 0 + 6 + - - 0 - 6 - none + + 1 + 6 + - - 1 - 6 - 4 + + 2 + 6 + - - 2 - 6 - -1 + + 3 + 6 + - - 3 - 6 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -718,10 +702,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -752,61 +735,59 @@ + + 4 + 6 + - - 4 - 6 - False + + 0 + 7 + - - 0 - 7 - end + + 1 + 7 + - - 1 - 7 - 4 + + 2 + 7 + - - 2 - 7 - -1 + + 3 + 7 + - - 3 - 7 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -839,10 +820,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -873,61 +853,59 @@ + + 4 + 7 + - - 4 - 7 - True + + 0 + 8 + - - 0 - 8 - end + + 1 + 8 + - - 1 - 8 - 4 + + 2 + 8 + - - 2 - 8 - -1 + + 3 + 8 + - - 3 - 8 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -962,10 +940,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -998,61 +975,59 @@ + + 4 + 8 + - - 4 - 8 - False + + 0 + 9 + - - 0 - 9 - none + + 1 + 9 + - - 1 - 9 - 8 + + 2 + 9 + - - 2 - 9 - -1 + + 3 + 9 + - - 3 - 9 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1083,10 +1058,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1115,61 +1089,59 @@ + + 4 + 9 + - - 4 - 9 - True + + 0 + 10 + - - 0 - 10 - none + + 1 + 10 + - - 1 - 10 - 8 + + 2 + 10 + - - 2 - 10 - -1 + + 3 + 10 + - - 3 - 10 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1202,10 +1174,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1236,61 +1207,59 @@ + + 4 + 10 + - - 4 - 10 - False + + 0 + 11 + - - 0 - 11 - end + + 1 + 11 + - - 1 - 11 - 8 + + 2 + 11 + - - 2 - 11 - -1 + + 3 + 11 + - - 3 - 11 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1323,10 +1292,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1357,61 +1325,59 @@ + + 4 + 11 + - - 4 - 11 - True + + 0 + 12 + - - 0 - 12 - end + + 1 + 12 + - - 1 - 12 - 8 + + 2 + 12 + - - 2 - 12 - -1 + + 3 + 12 + - - 3 - 12 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1446,10 +1412,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1482,61 +1447,59 @@ + + 4 + 12 + - - 4 - 12 - False + + 0 + 13 + - - 0 - 13 - none + + 1 + 13 + - - 1 - 13 - 12 + + 2 + 13 + - - 2 - 13 - -1 + + 3 + 13 + - - 3 - 13 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1567,10 +1530,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1599,61 +1561,59 @@ + + 4 + 13 + - - 4 - 13 - True + + 0 + 14 + - - 0 - 14 - none + + 1 + 14 + - - 1 - 14 - 12 + + 2 + 14 + - - 2 - 14 - -1 + + 3 + 14 + - - 3 - 14 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1686,10 +1646,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1720,61 +1679,59 @@ + + 4 + 14 + - - 4 - 14 - False + + 0 + 15 + - - 0 - 15 - end + + 1 + 15 + - - 1 - 15 - 12 + + 2 + 15 + - - 2 - 15 - -1 + + 3 + 15 + - - 3 - 15 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1807,10 +1764,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1841,61 +1797,59 @@ + + 4 + 15 + - - 4 - 15 - True + + 0 + 16 + - - 0 - 16 - end + + 1 + 16 + - - 1 - 16 - 12 + + 2 + 16 + - - 2 - 16 - -1 + + 3 + 16 + - - 3 - 16 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1930,10 +1884,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -1966,61 +1919,59 @@ + + 4 + 16 + - - 4 - 16 - False + + 0 + 17 + - - 0 - 17 - none + + 1 + 17 + - - 1 - 17 - -1 + + 2 + 17 + - - 2 - 17 - 4 + + 3 + 17 + - - 3 - 17 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2051,10 +2002,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2083,61 +2033,59 @@ + + 4 + 17 + - - 4 - 17 - True + + 0 + 18 + - - 0 - 18 - none + + 1 + 18 + - - 1 - 18 - -1 + + 2 + 18 + - - 2 - 18 - 4 + + 3 + 18 + - - 3 - 18 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2170,10 +2118,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2204,61 +2151,59 @@ + + 4 + 18 + - - 4 - 18 - False + + 0 + 19 + - - 0 - 19 - end + + 1 + 19 + - - 1 - 19 - -1 + + 2 + 19 + - - 2 - 19 - 4 + + 3 + 19 + - - 3 - 19 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2291,10 +2236,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2325,61 +2269,59 @@ + + 4 + 19 + - - 4 - 19 - True + + 0 + 20 + - - 0 - 20 - end + + 1 + 20 + - - 1 - 20 - -1 + + 2 + 20 + - - 2 - 20 - 4 + + 3 + 20 + - - 3 - 20 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2414,10 +2356,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2450,61 +2391,59 @@ + + 4 + 20 + - - 4 - 20 - False + + 0 + 21 + - - 0 - 21 - none + + 1 + 21 + - - 1 - 21 - 4 + + 2 + 21 + - - 2 - 21 - 4 + + 3 + 21 + - - 3 - 21 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2537,10 +2476,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2571,61 +2509,59 @@ + + 4 + 21 + - - 4 - 21 - True + + 0 + 22 + - - 0 - 22 - none + + 1 + 22 + - - 1 - 22 - 4 + + 2 + 22 + - - 2 - 22 - 4 + + 3 + 22 + - - 3 - 22 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2660,10 +2596,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2696,61 +2631,59 @@ + + 4 + 22 + - - 4 - 22 - False + + 0 + 23 + - - 0 - 23 - end + + 1 + 23 + - - 1 - 23 - 4 + + 2 + 23 + - - 2 - 23 - 4 + + 3 + 23 + - - 3 - 23 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2785,10 +2718,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2821,61 +2753,59 @@ + + 4 + 23 + - - 4 - 23 - True + + 0 + 24 + - - 0 - 24 - end + + 1 + 24 + - - 1 - 24 - 4 + + 2 + 24 + - - 2 - 24 - 4 + + 3 + 24 + - - 3 - 24 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2912,10 +2842,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -2950,61 +2879,59 @@ + + 4 + 24 + - - 4 - 24 - False + + 0 + 25 + - - 0 - 25 - none + + 1 + 25 + - - 1 - 25 - 8 + + 2 + 25 + - - 2 - 25 - 4 + + 3 + 25 + - - 3 - 25 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3037,10 +2964,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3071,61 +2997,59 @@ + + 4 + 25 + - - 4 - 25 - True + + 0 + 26 + - - 0 - 26 - none + + 1 + 26 + - - 1 - 26 - 8 + + 2 + 26 + - - 2 - 26 - 4 + + 3 + 26 + - - 3 - 26 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3160,10 +3084,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3196,61 +3119,59 @@ + + 4 + 26 + - - 4 - 26 - False + + 0 + 27 + - - 0 - 27 - end + + 1 + 27 + - - 1 - 27 - 8 + + 2 + 27 + - - 2 - 27 - 4 + + 3 + 27 + - - 3 - 27 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3285,10 +3206,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3321,61 +3241,59 @@ + + 4 + 27 + - - 4 - 27 - True + + 0 + 28 + - - 0 - 28 - end + + 1 + 28 + - - 1 - 28 - 8 + + 2 + 28 + - - 2 - 28 - 4 + + 3 + 28 + - - 3 - 28 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3412,10 +3330,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3450,61 +3367,59 @@ + + 4 + 28 + - - 4 - 28 - False + + 0 + 29 + - - 0 - 29 - none + + 1 + 29 + - - 1 - 29 - 12 + + 2 + 29 + - - 2 - 29 - 4 + + 3 + 29 + - - 3 - 29 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3537,10 +3452,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3571,61 +3485,59 @@ + + 4 + 29 + - - 4 - 29 - True + + 0 + 30 + - - 0 - 30 - none + + 1 + 30 + - - 1 - 30 - 12 + + 2 + 30 + - - 2 - 30 - 4 + + 3 + 30 + - - 3 - 30 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3660,10 +3572,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3696,61 +3607,59 @@ + + 4 + 30 + - - 4 - 30 - False + + 0 + 31 + - - 0 - 31 - end + + 1 + 31 + - - 1 - 31 - 12 + + 2 + 31 + - - 2 - 31 - 4 + + 3 + 31 + - - 3 - 31 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3785,10 +3694,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3821,61 +3729,59 @@ + + 4 + 31 + - - 4 - 31 - True + + 0 + 32 + - - 0 - 32 - end + + 1 + 32 + - - 1 - 32 - 12 + + 2 + 32 + - - 2 - 32 - 4 + + 3 + 32 + - - 3 - 32 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3912,10 +3818,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -3950,61 +3855,59 @@ + + 4 + 32 + - - 4 - 32 - False + + 0 + 33 + - - 0 - 33 - none + + 1 + 33 + - - 1 - 33 - -1 + + 2 + 33 + - - 2 - 33 - 8 + + 3 + 33 + - - 3 - 33 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4035,10 +3938,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4067,61 +3969,59 @@ + + 4 + 33 + - - 4 - 33 - True + + 0 + 34 + - - 0 - 34 - none + + 1 + 34 + - - 1 - 34 - -1 + + 2 + 34 + - - 2 - 34 - 8 + + 3 + 34 + - - 3 - 34 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4154,10 +4054,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4188,61 +4087,59 @@ + + 4 + 34 + - - 4 - 34 - False + + 0 + 35 + - - 0 - 35 - end + + 1 + 35 + - - 1 - 35 - -1 + + 2 + 35 + - - 2 - 35 - 8 + + 3 + 35 + - - 3 - 35 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4275,10 +4172,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4309,61 +4205,59 @@ + + 4 + 35 + - - 4 - 35 - True + + 0 + 36 + - - 0 - 36 - end + + 1 + 36 + - - 1 - 36 - -1 + + 2 + 36 + - - 2 - 36 - 8 + + 3 + 36 + - - 3 - 36 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4398,10 +4292,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4434,61 +4327,59 @@ + + 4 + 36 + - - 4 - 36 - False + + 0 + 37 + - - 0 - 37 - none + + 1 + 37 + - - 1 - 37 - 4 + + 2 + 37 + - - 2 - 37 - 8 + + 3 + 37 + - - 3 - 37 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4521,10 +4412,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4555,61 +4445,59 @@ + + 4 + 37 + - - 4 - 37 - True + + 0 + 38 + - - 0 - 38 - none + + 1 + 38 + - - 1 - 38 - 4 + + 2 + 38 + - - 2 - 38 - 8 + + 3 + 38 + - - 3 - 38 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4644,10 +4532,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4680,61 +4567,59 @@ + + 4 + 38 + - - 4 - 38 - False + + 0 + 39 + - - 0 - 39 - end + + 1 + 39 + - - 1 - 39 - 4 + + 2 + 39 + - - 2 - 39 - 8 + + 3 + 39 + - - 3 - 39 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4769,10 +4654,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4805,61 +4689,59 @@ + + 4 + 39 + - - 4 - 39 - True + + 0 + 40 + - - 0 - 40 - end + + 1 + 40 + - - 1 - 40 - 4 + + 2 + 40 + - - 2 - 40 - 8 + + 3 + 40 + - - 3 - 40 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4896,10 +4778,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -4934,61 +4815,59 @@ + + 4 + 40 + - - 4 - 40 - False + + 0 + 41 + - - 0 - 41 - none + + 1 + 41 + - - 1 - 41 - 8 + + 2 + 41 + - - 2 - 41 - 8 + + 3 + 41 + - - 3 - 41 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5021,10 +4900,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5055,61 +4933,59 @@ + + 4 + 41 + - - 4 - 41 - True + + 0 + 42 + - - 0 - 42 - none + + 1 + 42 + - - 1 - 42 - 8 + + 2 + 42 + - - 2 - 42 - 8 + + 3 + 42 + - - 3 - 42 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5144,10 +5020,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5180,61 +5055,59 @@ + + 4 + 42 + - - 4 - 42 - False + + 0 + 43 + - - 0 - 43 - end + + 1 + 43 + - - 1 - 43 - 8 + + 2 + 43 + - - 2 - 43 - 8 + + 3 + 43 + - - 3 - 43 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5269,10 +5142,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5305,61 +5177,59 @@ + + 4 + 43 + - - 4 - 43 - True + + 0 + 44 + - - 0 - 44 - end + + 1 + 44 + - - 1 - 44 - 8 + + 2 + 44 + - - 2 - 44 - 8 + + 3 + 44 + - - 3 - 44 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5396,10 +5266,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5434,61 +5303,59 @@ + + 4 + 44 + - - 4 - 44 - False + + 0 + 45 + - - 0 - 45 - none + + 1 + 45 + - - 1 - 45 - 12 + + 2 + 45 + - - 2 - 45 - 8 + + 3 + 45 + - - 3 - 45 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5521,10 +5388,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5555,61 +5421,59 @@ + + 4 + 45 + - - 4 - 45 - True + + 0 + 46 + - - 0 - 46 - none + + 1 + 46 + - - 1 - 46 - 12 + + 2 + 46 + - - 2 - 46 - 8 + + 3 + 46 + - - 3 - 46 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5644,10 +5508,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5680,61 +5543,59 @@ + + 4 + 46 + - - 4 - 46 - False + + 0 + 47 + - - 0 - 47 - end + + 1 + 47 + - - 1 - 47 - 12 + + 2 + 47 + - - 2 - 47 - 8 + + 3 + 47 + - - 3 - 47 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5769,10 +5630,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5805,61 +5665,59 @@ + + 4 + 47 + - - 4 - 47 - True + + 0 + 48 + - - 0 - 48 - end + + 1 + 48 + - - 1 - 48 - 12 + + 2 + 48 + - - 2 - 48 - 8 + + 3 + 48 + - - 3 - 48 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5896,10 +5754,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -5934,61 +5791,59 @@ + + 4 + 48 + - - 4 - 48 - False + + 0 + 49 + - - 0 - 49 - none + + 1 + 49 + - - 1 - 49 - -1 + + 2 + 49 + - - 2 - 49 - 12 + + 3 + 49 + - - 3 - 49 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6019,10 +5874,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6051,61 +5905,59 @@ + + 4 + 49 + - - 4 - 49 - True + + 0 + 50 + - - 0 - 50 - none + + 1 + 50 + - - 1 - 50 - -1 + + 2 + 50 + - - 2 - 50 - 12 + + 3 + 50 + - - 3 - 50 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6138,10 +5990,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6172,61 +6023,59 @@ + + 4 + 50 + - - 4 - 50 - False + + 0 + 51 + - - 0 - 51 - end + + 1 + 51 + - - 1 - 51 - -1 + + 2 + 51 + - - 2 - 51 - 12 + + 3 + 51 + - - 3 - 51 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6259,10 +6108,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6293,61 +6141,59 @@ + + 4 + 51 + - - 4 - 51 - True + + 0 + 52 + - - 0 - 52 - end + + 1 + 52 + - - 1 - 52 - -1 + + 2 + 52 + - - 2 - 52 - 12 + + 3 + 52 + - - 3 - 52 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6382,10 +6228,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6418,61 +6263,59 @@ + + 4 + 52 + - - 4 - 52 - False + + 0 + 53 + - - 0 - 53 - none + + 1 + 53 + - - 1 - 53 - 4 + + 2 + 53 + - - 2 - 53 - 12 + + 3 + 53 + - - 3 - 53 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6505,10 +6348,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6539,61 +6381,59 @@ + + 4 + 53 + - - 4 - 53 - True + + 0 + 54 + - - 0 - 54 - none + + 1 + 54 + - - 1 - 54 - 4 + + 2 + 54 + - - 2 - 54 - 12 + + 3 + 54 + - - 3 - 54 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6628,10 +6468,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6664,61 +6503,59 @@ + + 4 + 54 + - - 4 - 54 - False + + 0 + 55 + - - 0 - 55 - end + + 1 + 55 + - - 1 - 55 - 4 + + 2 + 55 + - - 2 - 55 - 12 + + 3 + 55 + - - 3 - 55 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6753,10 +6590,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6789,61 +6625,59 @@ + + 4 + 55 + - - 4 - 55 - True + + 0 + 56 + - - 0 - 56 - end + + 1 + 56 + - - 1 - 56 - 4 + + 2 + 56 + - - 2 - 56 - 12 + + 3 + 56 + - - 3 - 56 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6880,10 +6714,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -6918,61 +6751,59 @@ + + 4 + 56 + - - 4 - 56 - False + + 0 + 57 + - - 0 - 57 - none + + 1 + 57 + - - 1 - 57 - 8 + + 2 + 57 + - - 2 - 57 - 12 + + 3 + 57 + - - 3 - 57 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7005,10 +6836,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7039,61 +6869,59 @@ + + 4 + 57 + - - 4 - 57 - True + + 0 + 58 + - - 0 - 58 - none + + 1 + 58 + - - 1 - 58 - 8 + + 2 + 58 + - - 2 - 58 - 12 + + 3 + 58 + - - 3 - 58 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7128,10 +6956,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7164,61 +6991,59 @@ + + 4 + 58 + - - 4 - 58 - False + + 0 + 59 + - - 0 - 59 - end + + 1 + 59 + - - 1 - 59 - 8 + + 2 + 59 + - - 2 - 59 - 12 + + 3 + 59 + - - 3 - 59 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7253,10 +7078,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7289,61 +7113,59 @@ + + 4 + 59 + - - 4 - 59 - True + + 0 + 60 + - - 0 - 60 - end + + 1 + 60 + - - 1 - 60 - 8 + + 2 + 60 + - - 2 - 60 - 12 + + 3 + 60 + - - 3 - 60 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7380,10 +7202,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7418,61 +7239,59 @@ + + 4 + 60 + - - 4 - 60 - False + + 0 + 61 + - - 0 - 61 - none + + 1 + 61 + - - 1 - 61 - 12 + + 2 + 61 + - - 2 - 61 - 12 + + 3 + 61 + - - 3 - 61 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7505,10 +7324,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7539,61 +7357,59 @@ + + 4 + 61 + - - 4 - 61 - True + + 0 + 62 + - - 0 - 62 - none + + 1 + 62 + - - 1 - 62 - 12 + + 2 + 62 + - - 2 - 62 - 12 + + 3 + 62 + - - 3 - 62 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7628,10 +7444,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7664,61 +7479,59 @@ + + 4 + 62 + - - 4 - 62 - False + + 0 + 63 + - - 0 - 63 - end + + 1 + 63 + - - 1 - 63 - 12 + + 2 + 63 + - - 2 - 63 - 12 + + 3 + 63 + - - 3 - 63 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7753,10 +7566,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7789,61 +7601,59 @@ + + 4 + 63 + - - 4 - 63 - True + + 0 + 64 + - - 0 - 64 - end + + 1 + 64 + - - 1 - 64 - 12 + + 2 + 64 + - - 2 - 64 - 12 + + 3 + 64 + - - 3 - 64 - - False - True - False - False + 0 + 0 + 0 1 - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7880,10 +7690,9 @@ - False - True - False - False + 0 + 0 + 0 1 vertical @@ -7918,11 +7727,11 @@ + + 4 + 64 + - - 4 - 64 - diff --git a/testsuite/reftests/label-small-ellipsized.ref.ui b/testsuite/reftests/label-small-ellipsized.ref.ui index 03285d0664..bb047f0a15 100644 --- a/testsuite/reftests/label-small-ellipsized.ref.ui +++ b/testsuite/reftests/label-small-ellipsized.ref.ui @@ -1,13 +1,9 @@ - - False popup - True - False diff --git a/testsuite/reftests/label-small-ellipsized.ui b/testsuite/reftests/label-small-ellipsized.ui index 16f45fc31c..260149d2c1 100644 --- a/testsuite/reftests/label-small-ellipsized.ui +++ b/testsuite/reftests/label-small-ellipsized.ui @@ -1,13 +1,9 @@ - - False popup - True - False end diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui index 85245c16fe..b92d933f48 100644 --- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui +++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui @@ -1,16 +1,12 @@ - 500 100 - False popup - True - False Hello World - - True - False - Contents - - - - - True - False - Tab + + + + Contents + + + + + Tab + + diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui index 2fdee4c00b..209f3dc272 100644 --- a/testsuite/reftests/notebook-tab-position.ui +++ b/testsuite/reftests/notebook-tab-position.ui @@ -1,31 +1,28 @@ - - False popup 50 50 - True - True + 1 - - True - False - Contents - - - - - True - False - Tab + + + + Contents + + + + + Tab + + diff --git a/testsuite/reftests/nth-child.ref.ui b/testsuite/reftests/nth-child.ref.ui index 0ac156c89d..f8143de95e 100644 --- a/testsuite/reftests/nth-child.ref.ui +++ b/testsuite/reftests/nth-child.ref.ui @@ -1,210 +1,156 @@ - - False popup - True - False vertical - True - False 1 ref1 - True - False 2 ref2 - True - False 3 ref3 - True - False 4 = 2 * 2 ref4 - True - False 5 ref5 - True - False 6 = 2 * 3 ref6 - True - False 7 ref7 - True - False 8 = 2 * 2 * 2 ref8 - True - False 9 = 3 * 3 ref9 - True - False 10 = 2 * 5 ref10 - True - False 11 ref11 - True - False 12 = 2 * 2 * 3 ref12 - True - False 13 ref13 - True - False 14 = 2 * 7 ref14 - True - False 15 = 3 * 5 ref15 - True - False 16 = 2 * 2 * 2 * 2 ref16 - True - False 17 ref17 - True - False 18 = 2 * 3 * 3 ref18 - True - False 19 ref19 - True - False 20 = 2 * 2 * 5 ref20 - True - False 21 = 3 * 7 ref21 - True - False 22 = 2 * 11 ref22 - True - False 23 ref23 - True - False 24 = 2 * 2 * 2 * 3 ref24 - True - False 25 = 5 * 5 ref25 diff --git a/testsuite/reftests/nth-child.ui b/testsuite/reftests/nth-child.ui index e43bfb36f3..b8001fd18c 100644 --- a/testsuite/reftests/nth-child.ui +++ b/testsuite/reftests/nth-child.ui @@ -1,186 +1,132 @@ - - False popup - True - False vertical - True - False 1 - True - False 2 - True - False 3 - True - False 4 = 2 * 2 - True - False 5 - True - False 6 = 2 * 3 - True - False 7 - True - False 8 = 2 * 2 * 2 - True - False 9 = 3 * 3 - True - False 10 = 2 * 5 - True - False 11 - True - False 12 = 2 * 2 * 3 - True - False 13 - True - False 14 = 2 * 7 - True - False 15 = 3 * 5 - True - False 16 = 2 * 2 * 2 * 2 - True - False 17 - True - False 18 = 2 * 3 * 3 - True - False 19 - True - False 20 = 2 * 2 * 5 - True - False 21 = 3 * 7 - True - False 22 = 2 * 11 - True - False 23 - True - False 24 = 2 * 2 * 2 * 3 - True - False 25 = 5 * 5 diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui index 12403517bd..40232e76a7 100644 --- a/testsuite/reftests/opacity-initial.ref.ui +++ b/testsuite/reftests/opacity-initial.ref.ui @@ -1,11 +1,9 @@ - 200 100 - False popup diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui index 7d8a4b2af8..cc08a18087 100644 --- a/testsuite/reftests/opacity-initial.ui +++ b/testsuite/reftests/opacity-initial.ui @@ -1,3 +1,4 @@ + diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui index d810792507..535a35cb4e 100644 --- a/testsuite/reftests/opacity.ref.ui +++ b/testsuite/reftests/opacity.ref.ui @@ -1,28 +1,19 @@ - - False popup - True - False - True - False vertical - True - False vertical - True - True - True + 1 + 1 ref @@ -32,18 +23,13 @@ - True - False - True - False vertical - True - True - True + 1 + 1 ref diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui index ff290f1a17..69159109ed 100644 --- a/testsuite/reftests/opacity.ui +++ b/testsuite/reftests/opacity.ui @@ -1,31 +1,22 @@ - - False popup - True - False alpha - True - False vertical alpha - True - False vertical - alpha + alpha - True - True - True + 1 + 1 @@ -34,20 +25,15 @@ - True - False alpha - True - False vertical - alpha + alpha - True - True - True + 1 + 1 diff --git a/testsuite/reftests/overlay-no-main-widget.ref.ui b/testsuite/reftests/overlay-no-main-widget.ref.ui index 2e5a5abcd0..8327429142 100644 --- a/testsuite/reftests/overlay-no-main-widget.ref.ui +++ b/testsuite/reftests/overlay-no-main-widget.ref.ui @@ -1,3 +1,4 @@ + diff --git a/testsuite/reftests/overlay-no-main-widget.ui b/testsuite/reftests/overlay-no-main-widget.ui index 056026fd58..eaca0f2d0f 100644 --- a/testsuite/reftests/overlay-no-main-widget.ui +++ b/testsuite/reftests/overlay-no-main-widget.ui @@ -1,3 +1,4 @@ + diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui index be87576813..7a2ea496c2 100644 --- a/testsuite/reftests/paned-undersized.ref.ui +++ b/testsuite/reftests/paned-undersized.ref.ui @@ -1,13 +1,12 @@ + popup 120 - True - True - False - False + 0 + 0 1 vertical 10 diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui index 8c16abff94..aff21c97e7 100644 --- a/testsuite/reftests/paned-undersized.ui +++ b/testsuite/reftests/paned-undersized.ui @@ -1,13 +1,11 @@ + 120 popup - True - True - True - False + 0 1 vertical 10 @@ -17,11 +15,11 @@ 50 50 + + 0 + 0 + - - 0 - 0 - diff --git a/testsuite/reftests/picture-load-invalid-file.ref.ui b/testsuite/reftests/picture-load-invalid-file.ref.ui index 3500931a6b..3ae6f89153 100644 --- a/testsuite/reftests/picture-load-invalid-file.ref.ui +++ b/testsuite/reftests/picture-load-invalid-file.ref.ui @@ -1,11 +1,9 @@ - popup - - + diff --git a/testsuite/reftests/picture-load-invalid-file.ui b/testsuite/reftests/picture-load-invalid-file.ui index 8ca26cfacf..6b74b8a147 100644 --- a/testsuite/reftests/picture-load-invalid-file.ui +++ b/testsuite/reftests/picture-load-invalid-file.ui @@ -1,6 +1,5 @@ - popup diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui index f74ac3fde7..15ebb3d267 100644 --- a/testsuite/reftests/pseudoclass-on-box.ref.ui +++ b/testsuite/reftests/pseudoclass-on-box.ref.ui @@ -1,28 +1,21 @@ - - False popup - True - False vertical - True - True - True - True + 1 + 1 + 1 - True - False I should be red. - + diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui index 0a63b5c555..54255546f5 100644 --- a/testsuite/reftests/pseudoclass-on-box.ui +++ b/testsuite/reftests/pseudoclass-on-box.ui @@ -1,25 +1,18 @@ - - False popup - True - False vertical - True - True - True - True + 1 + 1 + 1 - True - False I should be red. diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui index 262c5118dd..c60fc8c499 100644 --- a/testsuite/reftests/pseudoclass-on-parent.ref.ui +++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui @@ -1,23 +1,18 @@ - - False popup - True - True - True - True + 1 + 1 + 1 - True - False I should be red. - + diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui index 9d54b8ef24..829aecc4ec 100644 --- a/testsuite/reftests/pseudoclass-on-parent.ui +++ b/testsuite/reftests/pseudoclass-on-parent.ui @@ -1,20 +1,15 @@ - - False popup - True - True - True - True + 1 + 1 + 1 - True - False I should be red. diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui index 3c8ff8c36f..c5509ae0b4 100644 --- a/testsuite/reftests/quit-mnemonic.ref.ui +++ b/testsuite/reftests/quit-mnemonic.ref.ui @@ -1,17 +1,13 @@ - - False popup - True - False Quit - + diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui index 128e33a191..b0f30e80a4 100644 --- a/testsuite/reftests/quit-mnemonic.ui +++ b/testsuite/reftests/quit-mnemonic.ui @@ -1,41 +1,33 @@ - - False popup - True - False - True - False Quit - + + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui index 3f0f3f1d4a..d3f4a731a4 100644 --- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui +++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui @@ -1,10 +1,8 @@ - 64 32 - False popup reference diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui index a6c83b876a..b91f9285a6 100644 --- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui +++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui @@ -1,10 +1,8 @@ - 64 32 - False popup diff --git a/testsuite/reftests/revealer-extra-size.ref.ui b/testsuite/reftests/revealer-extra-size.ref.ui index 8532cfc787..73ad6e03c6 100644 --- a/testsuite/reftests/revealer-extra-size.ref.ui +++ b/testsuite/reftests/revealer-extra-size.ref.ui @@ -1,16 +1,11 @@ - - 400 300 - False popup - True - False Hello World diff --git a/testsuite/reftests/revealer-extra-size.ui b/testsuite/reftests/revealer-extra-size.ui index 2a8e9006f5..4b121f219c 100644 --- a/testsuite/reftests/revealer-extra-size.ui +++ b/testsuite/reftests/revealer-extra-size.ui @@ -1,22 +1,15 @@ - - 400 300 - False popup - True - False none - True + 1 - True - False Hello World diff --git a/testsuite/reftests/revealer-wrappable-contents.ref.ui b/testsuite/reftests/revealer-wrappable-contents.ref.ui index 35542f25b2..89b534249d 100644 --- a/testsuite/reftests/revealer-wrappable-contents.ref.ui +++ b/testsuite/reftests/revealer-wrappable-contents.ref.ui @@ -1,19 +1,14 @@ - - - False popup 300 200 - True - False Hello World start - True + 1 diff --git a/testsuite/reftests/revealer-wrappable-contents.ui b/testsuite/reftests/revealer-wrappable-contents.ui index ccfb2c3a89..434d249467 100644 --- a/testsuite/reftests/revealer-wrappable-contents.ui +++ b/testsuite/reftests/revealer-wrappable-contents.ui @@ -1,25 +1,18 @@ - - - False popup 300 200 - True - False start none - True + 1 - True - False Hello World - True + 1 diff --git a/testsuite/reftests/rotated-layout.ref.ui b/testsuite/reftests/rotated-layout.ref.ui index 635bafe201..a6ae7ea6f8 100644 --- a/testsuite/reftests/rotated-layout.ref.ui +++ b/testsuite/reftests/rotated-layout.ref.ui @@ -1,38 +1,30 @@ - - False popup - True - False - True - False label + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - False label + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - diff --git a/testsuite/reftests/rotated-layout.ui b/testsuite/reftests/rotated-layout.ui index 1dfb8d9b0d..ba9603afbe 100644 --- a/testsuite/reftests/rotated-layout.ui +++ b/testsuite/reftests/rotated-layout.ui @@ -1,38 +1,30 @@ - - False popup - True - False - True - False label + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False label + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui index 1e450d5798..e3cd91644e 100644 --- a/testsuite/reftests/separator-size.ref.ui +++ b/testsuite/reftests/separator-size.ref.ui @@ -1,114 +1,94 @@ - - False popup - True - False - True - False help-about + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - False help-about + + 2 + 2 + 1 + 1 + - - 2 - 2 - 1 - 1 - - True - False help-about + + 2 + 0 + 1 + 1 + - - 2 - 0 - 1 - 1 - - True - False help-about + + 0 + 0 + 1 + 1 + - - 0 - 0 - 1 - 1 - - True - False vertical + + 1 + 0 + 1 + 1 + - - 1 - 0 - 1 - 1 - - True - False + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - False + + 2 + 1 + 1 + 1 + - - 2 - 1 - 1 - 1 - - True - False vertical + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui index 33df5589a9..8afd8a1b70 100644 --- a/testsuite/reftests/separator-size.ui +++ b/testsuite/reftests/separator-size.ui @@ -1,162 +1,118 @@ - - False popup - True - False - True - False vertical - True - False - True - True + 1 + 1 help-about - - True - False - + + + 0 + 0 + 1 + 2 + - - 0 - 0 - 1 - 2 - - True - False - True - False - True - True + 1 + 1 help-about - True - False vertical + + 0 + 2 + 2 + 1 + - - 0 - 2 - 2 - 1 - - True - False vertical - - True - False - + - True - False - True - True + 1 + 1 help-about + + 2 + 1 + 1 + 2 + - - 2 - 1 - 1 - 2 - - - - - True - True - False - False + 1 + 0 + 0 - True - False vertical - - True - False - + - True - False vertical + + 1 + 1 + - - 1 - 1 - - - - - True - False - True - False vertical - True - False - True - True + 1 + 1 help-about + + 1 + 0 + 2 + 1 + - - 1 - 0 - 2 - 1 - diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui index c9fe35a463..a64eebe5f3 100644 --- a/testsuite/reftests/set-default-direction.ref.ui +++ b/testsuite/reftests/set-default-direction.ref.ui @@ -1,17 +1,13 @@ - - False popup - True - False go-next diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui index 33cf5ca781..6f379a1f78 100644 --- a/testsuite/reftests/set-default-direction.ui +++ b/testsuite/reftests/set-default-direction.ui @@ -1,16 +1,12 @@ - - False popup - True - False go-next diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui index 31f744d3a9..97be53210b 100644 --- a/testsuite/reftests/shadow-clip-rounding.ref.ui +++ b/testsuite/reftests/shadow-clip-rounding.ref.ui @@ -1,16 +1,12 @@ - 100 100 - False popup - True - False center center X diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui index 03741621b7..7672f7db14 100644 --- a/testsuite/reftests/shadow-clip-rounding.ui +++ b/testsuite/reftests/shadow-clip-rounding.ui @@ -1,16 +1,12 @@ - 100 100 - False popup - True - False center center X diff --git a/testsuite/reftests/shorthand-entry-border.ref.ui b/testsuite/reftests/shorthand-entry-border.ref.ui index ea181fe669..bd5c6d34a1 100644 --- a/testsuite/reftests/shorthand-entry-border.ref.ui +++ b/testsuite/reftests/shorthand-entry-border.ref.ui @@ -1,13 +1,10 @@ - - False popup - True - True + 1 reference diff --git a/testsuite/reftests/shorthand-entry-border.ui b/testsuite/reftests/shorthand-entry-border.ui index 91ce522a98..6c5efd2a3e 100644 --- a/testsuite/reftests/shorthand-entry-border.ui +++ b/testsuite/reftests/shorthand-entry-border.ui @@ -1,13 +1,10 @@ - - False popup - True - True + 1 diff --git a/testsuite/reftests/sibling-pseudoclasses.ref.ui b/testsuite/reftests/sibling-pseudoclasses.ref.ui index 138c9eeb02..cdf575d44a 100644 --- a/testsuite/reftests/sibling-pseudoclasses.ref.ui +++ b/testsuite/reftests/sibling-pseudoclasses.ref.ui @@ -1,20 +1,15 @@ - - False - True - False vertical - True - True - True - True + 1 + 1 + 1 @@ -22,11 +17,9 @@ - True - False - I'm tomato. + I'm tomato. - + diff --git a/testsuite/reftests/sibling-pseudoclasses.ui b/testsuite/reftests/sibling-pseudoclasses.ui index d93ff4da9d..45859193f0 100644 --- a/testsuite/reftests/sibling-pseudoclasses.ui +++ b/testsuite/reftests/sibling-pseudoclasses.ui @@ -1,20 +1,15 @@ - - False - True - False vertical - True - True - True - True + 1 + 1 + 1 @@ -22,9 +17,7 @@ - True - False - I'm tomato. + I'm tomato. diff --git a/testsuite/reftests/simple.ref.ui b/testsuite/reftests/simple.ref.ui index c6c3361585..34efec74e8 100644 --- a/testsuite/reftests/simple.ref.ui +++ b/testsuite/reftests/simple.ref.ui @@ -1,15 +1,11 @@ - 10 10 - False popup - True - False diff --git a/testsuite/reftests/simple.ui b/testsuite/reftests/simple.ui index c6c3361585..34efec74e8 100644 --- a/testsuite/reftests/simple.ui +++ b/testsuite/reftests/simple.ui @@ -1,15 +1,11 @@ - 10 10 - False popup - True - False diff --git a/testsuite/reftests/sizegroups-basics.ref.ui b/testsuite/reftests/sizegroups-basics.ref.ui index 15c7a01dd3..2dfae31713 100644 --- a/testsuite/reftests/sizegroups-basics.ref.ui +++ b/testsuite/reftests/sizegroups-basics.ref.ui @@ -1,54 +1,45 @@ - - False popup - - - True - False - vertical - - - True - False - vertical - True - True - - - True - - + + + vertical + + + vertical + 1 + 1 + + + 0 0 - - - - - True - medium - - + + + + + + medium + 1 1 - - - - - True - wrap this very long text please or I'll need to write even more - True - - + + + + + + wrap this very long text please or I'll need to write even more + 1 + 2 2 - - - - - + + + + + + diff --git a/testsuite/reftests/sizegroups-basics.ui b/testsuite/reftests/sizegroups-basics.ui index 696802cda5..ae2239b426 100644 --- a/testsuite/reftests/sizegroups-basics.ui +++ b/testsuite/reftests/sizegroups-basics.ui @@ -1,60 +1,51 @@ - - False popup - - - True - False - vertical - - - True - False - vertical - - - True - - + + + vertical + + + vertical + + + 0 0 - - - - - True - medium - - + + + + + + medium + 1 1 - - - - - True - wrap this very long text please or I'll need to write even more - True - - + + + + + + wrap this very long text please or I'll need to write even more + 1 + 2 2 - - - - - + + + + + + both - - - + + + diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui index f2bbe6b7b4..4f03d91f24 100644 --- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui +++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui @@ -1,242 +1,213 @@ - - False popup - True - False 6 6 - True - False 0 - Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send. - True + Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send. + 1 + + 0 + 0 + 2 + 1 + - - 0 - 0 - 2 - 1 - - True - False 0 <b>Account Information</b> - True + 1 + + 0 + 1 + 2 + 1 + - - 0 - 1 - 2 - 1 - - True - False 12 0 Type the name by which you would like to refer to this account. -For example, "Work" or "Personal". +For example, "Work" or "Personal". + + 0 + 2 + 2 + 1 + - - 0 - 2 - 2 - 1 - - True - False 12 1 _Name: - True + 1 entry1 + + 0 + 3 + 1 + 1 + - - 0 - 3 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 3 + 1 + 1 + - - 1 - 3 - 1 - 1 - - True - False 0 <b>Required Information</b> - True + 1 + + 0 + 4 + 2 + 1 + - - 0 - 4 - 2 - 1 - - True - False 12 1 Full Nam_e: - True + 1 entry2 + + 0 + 5 + 1 + 1 + - - 0 - 5 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 5 + 1 + 1 + - - 1 - 5 - 1 - 1 - - True - False 12 Email _Address: - True + 1 + + 0 + 6 + 1 + 1 + - - 0 - 6 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 6 + 1 + 1 + - - 1 - 6 - 1 - 1 - - True - False 0 <b>Optional Information</b> - True + 1 + + 0 + 7 + 2 + 1 + - - 0 - 7 - 2 - 1 - - True - False 12 1 Re_ply-To: - True + 1 entry4 + + 0 + 8 + 1 + 1 + - - 0 - 8 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 8 + 1 + 1 + - - 1 - 8 - 1 - 1 - - True - False 12 1 Or_ganization: - True + 1 entry5 + + 0 + 9 + 1 + 1 + - - 0 - 9 - 1 - 1 - - True - True + 1 ● + + 1 + 9 + 1 + 1 + - - 1 - 9 - 1 - 1 - diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ui index 23b2e4783f..f1525ab882 100644 --- a/testsuite/reftests/sizegroups-evolution-identity-page.ui +++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui @@ -1,258 +1,223 @@ - - False popup - True - False vertical 6 - True - False 0 - Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send. - True + Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send. + 1 - True - False 6 6 - True - False 0 <b>Account Information</b> - True + 1 + + 0 + 0 + 2 + 1 + - - 0 - 0 - 2 - 1 - - True - False 12 0 Type the name by which you would like to refer to this account. -For example, "Work" or "Personal". +For example, "Work" or "Personal". + + 0 + 1 + 2 + 1 + - - 0 - 1 - 2 - 1 - - True - False 12 1 _Name: - True + 1 entry1 + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - - True - False 6 6 - True - False 0 <b>Required Information</b> - True + 1 + + 0 + 0 + 2 + 1 + - - 0 - 0 - 2 - 1 - - True - False 12 1 Full Nam_e: - True + 1 entry2 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 1 + 1 + 1 + - - 1 - 1 - 1 - 1 - - True - False 12 Email _Address: - True + 1 + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 2 + 1 + 1 + - - 1 - 2 - 1 - 1 - - True - False 6 6 - True - False 0 <b>Optional Information</b> - True + 1 + + 0 + 0 + 3 + 1 + - - 0 - 0 - 3 - 1 - - True - False 12 1 Re_ply-To: - True + 1 entry4 + + 0 + 1 + 1 + 1 + - - 0 - 1 - 1 - 1 - - True - True - True + 1 + 1 ● + + 1 + 1 + 2 + 1 + - - 1 - 1 - 2 - 1 - - True - False 12 1 Or_ganization: - True + 1 entry5 + + 0 + 2 + 1 + 1 + - - 0 - 2 - 1 - 1 - - True - True + 1 ● + + 1 + 2 + 2 + 1 + - - 1 - 2 - 2 - 1 - @@ -260,13 +225,12 @@ For example, "Work" or "Personal". - horizontal - - - - - + + + + + diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui index 54aa61c4b0..b5151592fa 100644 --- a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui +++ b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui @@ -1,21 +1,16 @@ - - False popup - - - True - False - - - True - Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups. - True - - - + + + + + Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups. + 1 + + + diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ui b/testsuite/reftests/sizegroups-get-preferred-null.ui index 23b78f95d1..b0f8074c84 100644 --- a/testsuite/reftests/sizegroups-get-preferred-null.ui +++ b/testsuite/reftests/sizegroups-get-preferred-null.ui @@ -1,26 +1,21 @@ - - False popup - - - True - False - - - True - Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups. - True - - - + + + + + Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups. + 1 + + + - + diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui index 401c89b0dc..169f08fc43 100644 --- a/testsuite/reftests/statusbar-remove-all.ref.ui +++ b/testsuite/reftests/statusbar-remove-all.ref.ui @@ -1,14 +1,10 @@ - - False popup - True - False 10 10 6 diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui index 76c1a17ae9..26113ca552 100644 --- a/testsuite/reftests/statusbar-remove-all.ui +++ b/testsuite/reftests/statusbar-remove-all.ui @@ -1,14 +1,10 @@ - - False popup - True - False 10 10 6 diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui b/testsuite/reftests/style-context-save-inheritance.ref.ui index 09b5af581a..abbb2f709b 100644 --- a/testsuite/reftests/style-context-save-inheritance.ref.ui +++ b/testsuite/reftests/style-context-save-inheritance.ref.ui @@ -1,18 +1,14 @@ - - False popup reference - True - False GREEN -<a href="http://www.gtk.org">GREEN</a> - True +<a href="http://www.gtk.org">GREEN</a> + 1 diff --git a/testsuite/reftests/style-context-save-inheritance.ui b/testsuite/reftests/style-context-save-inheritance.ui index 022033b22c..c8395ae1b6 100644 --- a/testsuite/reftests/style-context-save-inheritance.ui +++ b/testsuite/reftests/style-context-save-inheritance.ui @@ -1,17 +1,13 @@ - - False popup - True - False GREEN -<a href="http://www.gtk.org">GREEN</a> - True +<a href="http://www.gtk.org">GREEN</a> + 1 diff --git a/testsuite/reftests/style-properties-only-child.ref.ui b/testsuite/reftests/style-properties-only-child.ref.ui index e6e4d3bd39..78bfbf4c79 100644 --- a/testsuite/reftests/style-properties-only-child.ref.ui +++ b/testsuite/reftests/style-properties-only-child.ref.ui @@ -1,20 +1,15 @@ - - False popup 300 300 - True - False vertical - True - True + 1 Foo